diff --git a/journal/2021-02-13.md b/journal/2021-02-13.md index 3dc582c8a..41886c02b 100644 --- a/journal/2021-02-13.md +++ b/journal/2021-02-13.md @@ -1,3 +1,4 @@ # 2021-02-13 -- [[flan]] \ No newline at end of file +- [[flan]] +- [[merveilles]] \ No newline at end of file diff --git a/merveilles.md b/merveilles.md new file mode 100644 index 000000000..ee06d718b --- /dev/null +++ b/merveilles.md @@ -0,0 +1,15 @@ +# Merveilles + +- A [[federation]] [[instance]]. + - [[fediverse]] [[mastodon]] +- Was accepted into it on [[2021-02-12]] by [[devine-lu-linvega]]. + - @flaneur@merveilles.town == https://merveilles.town/web/accounts/113872 + + +[//begin]: # "Autogenerated link references for markdown compatibility" +[federation]: federation "Federation" +[fediverse]: fediverse "Fediverse" +[mastodon]: mastodon "Mastodon" +[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