99de9739f0
Charlotte 💍 Lotte
2025-02-15 15:52:34 +01:00
171b9d0f47
Merge pull request 'Undo merge conflict resolution' ( #35 ) from amedee/polycule:fix-merge-conflict into main
...
Reviewed-on: Elizhium/polycule#35
2025-02-11 06:31:14 +01:00
db67bc7512
Undo merge conflict resolution
...
Removed connections were re-added in 46a1126c434fb586
2025-02-10 19:41:27 +01:00
93cd18d8c0
Merge pull request 'also fixed circle spelling...' ( #34 ) from Emily-Sarah-Larra/polycule:main into main
...
Reviewed-on: Elizhium/polycule#34
2025-02-10 19:22:40 +01:00
c6b3df01fe
Merge branch 'main' into main
2025-02-10 19:22:33 +01:00
0e1a708dba
also fixed circle spelling...
2025-02-10 19:21:24 +01:00
46a1126c38
Merge pull request 'main' ( #33 ) from Emily-Sarah-Larra/polycule:main into main
...
Reviewed-on: Elizhium/polycule#33
2025-02-10 19:19:19 +01:00
eaabba8c0f
merge upstream
2025-02-10 19:17:49 +01:00
1806ee48a2
Fixed cirlces missing and oriana name
2025-02-10 19:16:40 +01:00
434fb58648
Merge pull request 'Update polycule.puml' ( #31 ) from Emily-Sarah-Larra/polycule:main into main
...
Reviewed-on: Elizhium/polycule#31
2025-02-10 19:09:15 +01:00
e8b13dffc3
Merge remote-tracking branch 'upstream/main'
2025-02-10 19:08:17 +01:00
3932921749
Update polycule.puml
2025-02-10 18:53:48 +01:00
f161eb8623
Merge pull request 'Hester & Tom are sitting in a tree...' ( #32 ) from amedee/polycule:hester into main
...
Reviewed-on: Elizhium/polycule#32
2025-02-10 15:43:04 +01:00
45e405d563
Hester & Tom are sitting in a tree...
2025-02-10 14:25:37 +01:00
e31f793bf3
Update polycule.puml
2025-02-08 09:46:46 +01:00
af6f8aa834
Update polycule.puml
2025-02-08 09:43:54 +01:00
3533c1dfa2
Merge pull request 'february-update' ( #30 ) from amedee/polycule:february-update into main
...
Reviewed-on: Elizhium/polycule#30
2025-02-08 09:33:03 +01:00
697544001b
Update polycule.puml
2025-02-07 16:56:53 +01:00
248a94f562
Update polycule.puml
2025-02-07 16:52:41 +01:00
Amedee Van Gasse ✨🌈🦄
1a6077b5d2
Bump PlantUML version to 1.2025.0
2025-02-07 12:07:48 +01:00
Amedee Van Gasse ✨🌈🦄
ad6503ed7b
February 2025 update
...
* Add Tine's current connections
* Remove some of the weaker connections
2025-02-07 12:02:22 +01:00
725c5cf19f
Update polycule.puml
2025-02-05 10:57:36 +01:00
b4a72ccfde
Update polycule.puml
2025-01-18 23:12:21 +01:00
77162d0746
Merge pull request 'Amedee & Evi went from dating to partner' ( #29 ) from amedee/polycule:amedee-and-evi into main
...
Reviewed-on: Elizhium/polycule#29
2025-01-09 20:28:09 +01:00
2ccc9c6592
Amedee & Evi went from dating to partner
2025-01-09 20:20:26 +01:00
78e7fcadef
Merge pull request 'November updates' ( #28 ) from amedee/polycule:november into main
...
Reviewed-on: Elizhium/polycule#28
2025-01-08 08:34:09 +01:00
Elizabeth
d2997001db
Merge branch 'main' of https://git.bruynooghe.dev/Elizhium/polycule
2025-01-04 12:09:17 +01:00
Elizabeth
da19aea152
updates and pruning
2025-01-04 12:06:09 +01:00
52d2e31d48
Merge pull request 'Update EOY changes' ( #27 ) from Mira91/polycule:Mira91-patch1 into main
...
Reviewed-on: Elizhium/polycule#27
2025-01-04 00:17:38 +01:00
03791c6af0
Update EOY changes
2025-01-03 21:28:42 +01:00
35bb0873a8
Update polycule.puml
2025-01-03 16:08:13 +01:00
b8b33b05ce
Merge pull request 'Bump version of PlantUML to v1.2024.8' ( #21 ) from amedee/polycule:version-bump into main
...
Reviewed-on: Elizhium/polycule#21
2025-01-03 15:59:22 +01:00
39fff2ea0b
Merge pull request 'Update Els relationship status' ( #23 ) from amedee/polycule:els into main
...
Reviewed-on: Elizhium/polycule#23
2025-01-03 15:58:52 +01:00
27aff8a702
Merge pull request 'Update Ria relationship status' ( #22 ) from amedee/polycule:ria into main
...
Reviewed-on: Elizhium/polycule#22
2025-01-03 15:58:23 +01:00
27c03b6c60
Merge pull request 'Amedee started dating Alexia' ( #26 ) from amedee/polycule:alexia into main
...
Reviewed-on: Elizhium/polycule#26
2025-01-03 15:56:22 +01:00
5dcf8f818c
Merge pull request 'Remove a few weak or unconfirmed connections' ( #20 ) from amedee/polycule:remove-unconfirmed into main
...
Reviewed-on: Elizhium/polycule#20
2024-12-21 09:28:09 +01:00
2dadd3dcdc
Merge branch 'main' into remove-unconfirmed
2024-12-21 09:27:49 +01:00
3d34eb9ce8
Merge pull request 'Enya and Kyra got married 2024-11-08!' ( #19 ) from amedee/polycule:main into main
...
Reviewed-on: Elizhium/polycule#19
2024-12-21 09:27:36 +01:00
ae94473604
Merge branch 'main' into main
2024-12-21 09:27:13 +01:00
e4a3ac3a15
Update polycule.puml
2024-12-18 13:07:22 +01:00
cb41b36022
Update polycule.puml
2024-12-14 09:16:18 +01:00
Amedee Van Gasse ✨🌈🦄
361376072c
Amedee started dating Alexia
2024-12-09 18:30:00 +01:00
Amedee Van Gasse ✨🌈🦄
60446746a6
Remove a few weak or unconfirmed connections
2024-12-01 12:00:00 +01:00
Amedee Van Gasse ✨🌈🦄
f0ef6fd868
Bump version of PlantUML to v1.2024.8
2024-11-15 19:08:00 +00:00
Amedee Van Gasse ✨🌈🦄
de1c6db71d
November updates
...
* Jelle is dating Lies, so Jelle's polycule is added
* Hester broke up with Frank, so Frank's polycule is deleted
* Hester is no longer dating 'boomknuffelaar'
* Hester and Amedee have some unlabeled situationship?
* Some shenanigans to reduce crossing lines
2024-11-14 20:00:00 +01:00
b5c388018c
Merge pull request 'rachel-ward-partner' ( #18 ) from tara/polycule:rachel-ward-partner into main
...
Reviewed-on: Elizhium/polycule#18
2024-11-10 20:15:54 +01:00
Amedee Van Gasse ✨🌈🦄
cecd405173
Enya and Kyra got married 2024-11-08!
2024-11-08 14:00:00 +01:00
990472b89c
Rachel and Ward became partbers
...
Requested by Mira
2024-11-07 20:52:38 +01:00
4af65679d9
Merge pull request 'main' ( #17 ) from amedee/polycule:main into main
...
Reviewed-on: Elizhium/polycule#17
2024-11-05 19:48:07 +01:00
Amedee Van Gasse ✨🌈🦄
0ce3e28f1e
Hester and Jelle are no longer dating
2024-11-05 17:19:52 +01:00
