From 88e1cde12c5fa214e8a9391c6b2e5292401f62b9 Mon Sep 17 00:00:00 2001 From: Ammar Hussein Date: Thu, 18 Jun 2026 13:49:12 -0700 Subject: [PATCH] add proposal 42 --- .gitignore | 2 +- .../resolutions/{draft/xx.md => in-progress/042.md} | 10 +++++----- mkdocs.yml | 2 ++ 3 files changed, 8 insertions(+), 6 deletions(-) rename docs/federation/resolutions/{draft/xx.md => in-progress/042.md} (83%) diff --git a/.gitignore b/.gitignore index 20a9403..ac57e56 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ site/ .venv -.~ \ No newline at end of file +*~ \ No newline at end of file diff --git a/docs/federation/resolutions/draft/xx.md b/docs/federation/resolutions/in-progress/042.md similarity index 83% rename from docs/federation/resolutions/draft/xx.md rename to docs/federation/resolutions/in-progress/042.md index df0c604..facbf6e 100644 --- a/docs/federation/resolutions/draft/xx.md +++ b/docs/federation/resolutions/in-progress/042.md @@ -1,10 +1,10 @@ --- -title: "Resolution XXX: Bunk Computer Cooperative to join the federation as a member" +title: "Resolution 042: Bunk Computer Cooperative to join the federation as a member" --- -- Topic: Resolution XXX: Bunk Computer Cooperative to join the federation as a member -- Date: 2026-06-09 -- Deadline: ??? +- Topic: Resolution 042: Bunk Computer Cooperative to join the federation as a member +- Date: 2026-06-18 +- Deadline: 2026-07-03 - Size: large ## Summary @@ -17,6 +17,6 @@ In Maren's words: > Bunk has been using coop cloud since we started our co-op. Once we learned about co-op cloud, it was apparent to all three of our members that co-op cloud's structure was super smart. Tooling maintained by a federation of the co-ops that use it is set up for long term sustainability, and we want to contribute to that sustainability just as we benefit from it. We hope to upstream our work on co-op cloud whenever possible, and have already done some of that with Nextcloud and Keycloak. -@ammaratef45:matrix.org from [RTM](https://resisttechmonopolies.online/) has offered to vouch for us. +@ammaratef45:matrix.org from [RTM](https://resisttechmonopolies.online/) happy offered to vouch. Bunk's representative to the federation will be Maren. She can be reached at `@maren:matrix.bunk.computer` on Matrix or `maren@bunk.computer` on email. diff --git a/mkdocs.yml b/mkdocs.yml index b489cae..a3747b5 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -139,12 +139,14 @@ nav: - federation/resolutions/passed/037.md - federation/resolutions/passed/038.md - federation/resolutions/passed/039.md + - federation/resolutions/passed/041.md - "Stalled": - federation/resolutions/stalled/013.md - federation/resolutions/stalled/030.md - "In Progress": - federation/resolutions/index.md - federation/resolutions/in-progress/040.md + - federation/resolutions/in-progress/042.md - "Minutes": - federation/minutes/index.md - "Recently":