From e67eee304a62a5f319b1a1997d29b4c02a00373a Mon Sep 17 00:00:00 2001 From: ammar Date: Tue, 10 Mar 2026 13:05:56 -0700 Subject: [PATCH] resolution 38 passed, merri-bek yech is now a member --- docs/federation/membership.md | 1 + docs/federation/resolutions/{in-progress => passed}/038.md | 0 mkdocs.yml | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) rename docs/federation/resolutions/{in-progress => passed}/038.md (100%) diff --git a/docs/federation/membership.md b/docs/federation/membership.md index 1acd38d..7cf0813 100644 --- a/docs/federation/membership.md +++ b/docs/federation/membership.md @@ -21,3 +21,4 @@ title: Membership | [RTM](https://resisttechmonopolies.online) | ✅ | - | `@ammaratef45:matrix.org` + `@linnealovespie:matrix.org`| | [MIR](https://mirnet.org/) | ✅ | - | `@sixsmith:matrix.org` | | [Red Abya Yala](https://abyayala.sutty.nl/) | - | - | `@fauno:sutty.nl` | +| [Merri-bek tech]( ammaratef45@proton.me ) | - | - | `coop-cloud-delegate@merri-bek.tech`| diff --git a/docs/federation/resolutions/in-progress/038.md b/docs/federation/resolutions/passed/038.md similarity index 100% rename from docs/federation/resolutions/in-progress/038.md rename to docs/federation/resolutions/passed/038.md diff --git a/mkdocs.yml b/mkdocs.yml index 3aae5f9..1dedf65 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -131,6 +131,7 @@ nav: - federation/resolutions/passed/033.md - federation/resolutions/passed/034.md - federation/resolutions/passed/036.md + - federation/resolutions/passed/038.md - "Stalled": - federation/resolutions/stalled/013.md - federation/resolutions/stalled/030.md @@ -138,7 +139,6 @@ nav: - federation/resolutions/index.md - federation/resolutions/in-progress/035.md - federation/resolutions/in-progress/037.md - - federation/resolutions/in-progress/038.md - "Minutes": - federation/minutes/index.md - "Recently": -- 2.49.0