Merge branch 'main' into remove-unconfirmed

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:49 +01:00 · 2024-12-21 09:27:36 +01:00 · 2024-12-21 09:27:13 +01:00 · 2024-12-18 13:07:22 +01:00 · 2024-12-14 09:16:18 +01:00 · 2024-11-08 14:00:00 +01:00
1 changed files with 2 additions and 2 deletions
--- a/polycule.puml
+++ b/polycule.puml
@@ -62,7 +62,6 @@ Mira --  Rachel: Married
 Jack --  Merel: Partner
 Jack ..  Lara: Casual
 Jack ..  Soda: Casual
 Elizabeth -- Talinka: Partner
 Jenna -- Talinka : Partner
 Talinka .. Jack : Casual
 Rosie -- Ashley : Engaged
@@ -87,7 +86,7 @@ Evi -- Amber : Partner
 Amber -- Charlotte : Partner
 Shen .. Talinka : Casual
 Amedee -- Enya: Partner
-Enya -- Kyra: Engaged
+Enya -- Kyra: Married
 Amedee .. Chloe: Casual
 Amedee .. Ria: Casual
 Ria .. Bart: Dating
@@ -114,5 +113,6 @@ Mira .. Hannah : Casual
 Tara -- Mira: Partner
 Tara -- Evi: Partner
 Tara .. Amedee: Casual
 "Emily-Larra" .. Elizabeth: Dating
@enduml
Author	SHA1	Message	Date
Elizhium	2dadd3dcdc	Merge branch 'main' into remove-unconfirmed	2024-12-21 09:27:49 +01:00
Elizhium	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
Elizhium	ae94473604	Merge branch 'main' into main Some checks failed Publish diagram / render (push) Has been cancelled Details Publish diagram / publish (push) Has been cancelled Details	2024-12-21 09:27:13 +01:00
Elizhium	e4a3ac3a15	Update polycule.puml	2024-12-18 13:07:22 +01:00
Elizhium	cb41b36022	Update polycule.puml	2024-12-14 09:16:18 +01:00
Amedee Van Gasse ✨🌈🦄	cecd405173	Enya and Kyra got married 2024-11-08! Some checks are pending Publish diagram / render (push) Waiting to run Details Publish diagram / publish (push) Blocked by required conditions Details	2024-11-08 14:00:00 +01:00