fix merge-conflict in Resolution 017

This commit is contained in:
2024-02-21 17:14:30 +01:00
8 changed files with 193 additions and 124 deletions

View File

@ -55,6 +55,7 @@ nav:
- index.md
- "Frequently asked questions": intro/faq.md
- "Project strategy": intro/strategy.md
- "Comparisons": intro/comparisons.md
- "Project status": intro/bikemap.md
- "Managed hosting": intro/managed.md
- "Get in touch": intro/contact.md
@ -92,6 +93,7 @@ nav:
- "Cheat Sheet": abra/cheat-sheet.md
- "Get Involved":
- get-involved/index.md
- "Support Us": get-involved/support.md
- "Federation":
- federation/index.md
- "Bylaws": federation/bylaws.md