From 7e5f1a9c02c10d2b32771fb23dc643cac592a4d9 Mon Sep 17 00:00:00 2001 From: Flancian <0@flancia.org> Date: Tue, 16 Feb 2021 20:13:53 +0100 Subject: [PATCH] Auto: misc. --- izzy-swart.md | 1 + merveilles.md | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/izzy-swart.md b/izzy-swart.md index 191979f98..de0197f01 100644 --- a/izzy-swart.md +++ b/izzy-swart.md @@ -4,6 +4,7 @@ - [[pull]] [[syntacticsugarglider]] - [[merveilles]] https://merveilles.town/web/accounts/18164 - [[go]] syntacticsugarglider.com +- Had a significant chat on [[2021-02-15]]. They are diff --git a/merveilles.md b/merveilles.md index 0eef532bc..41e694a4e 100644 --- a/merveilles.md +++ b/merveilles.md @@ -2,21 +2,23 @@ - A [[town]]. - [[go]] https://merveilles.town -- A [[federation]] [[instance]]. - - [[fediverse]] [[mastodon]] - - [[contract]] https://github.com/merveilles/The-Town#instance-rules - - [[trello]] https://trello.com/b/kGZUUev9/the-town - - Was accepted into it on [[2021-02-12]] by [[devine-lu-linvega]]. - - @flaneur@merveilles.town - - https://merveilles.town/web/accounts/113872 +- [[push]] [[federation]] + - A [[mastodon]] [[instance]]. +- [[contract]] https://github.com/merveilles/The-Town#instance-rules +- [[trello]] https://trello.com/b/kGZUUev9/the-town +- [[flancian]] @flaneur@merveilles.town + - Was accepted into [[merveilles]] on [[2021-02-12]] by [[devine-lu-linvega]]. + - https://merveilles.town/web/accounts/113872 [//begin]: # "Autogenerated link references for markdown compatibility" [go]: go "Go" +[push]: push "Push" [federation]: federation "Federation" -[fediverse]: fediverse "Fediverse" [mastodon]: mastodon "Mastodon" [contract]: contract "CONTRACT" +[flancian]: flancian "Flancian" +[merveilles]: merveilles "Merveilles" [2021-02-12]: journal/2021-02-12 "2021-02-12" [devine-lu-linvega]: devine-lu-linvega "Devine Lu Linvega" [//end]: # "Autogenerated link references" \ No newline at end of file