resolution 38 passed, merri-bek yech is now a member

2026-03-10 13:05:56 -07:00
3 changed files with 2 additions and 1 deletions
--- 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 ) | - | - | `?`|
--- a/docs/federation/resolutions/in-progress/038.md
+++ b/docs/federation/resolutions/in-progress/038.md
--- 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":