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

@ -1,10 +1,9 @@
---
title: "Resolution 017"
---
- Topic: BeWater joins the Co-op Cloud Federation
- Date: 30-01-2024
- Deadline: 13-02-2024
- Deadline: 21-02-2024
- Size: Large
### Summary