Skip to content
Snippets Groups Projects
Commit 676189f7 authored by Pieter van der Hijden's avatar Pieter van der Hijden
Browse files

Merge branch 'master' of gitlab.fabcloud.org:fl-management/fl-sdgs/sdg-workshop

parents 3e2022b2 1a4c5951
No related branches found
No related tags found
No related merge requests found
......@@ -14,8 +14,12 @@ All you need to run the latest version of the local fab lab workshop.
Files to prepare the workshop-kit files.
## Folder: fab-conference-proceedings
Pictures and evaluations on past sessions at Fab conferences
<<<<<<< HEAD
### 2018 fab14-toulouse-france: Pictures and evaluations on FAB14 session
=======
### 2018 fab14-tou;ouse-france: Pictures and evaluations on FAB14 session
>>>>>>> 1a4c5951f216c80b56d6c138413ec150c983128b
### 2019 fab15-elgouna-egypt: sources, kit and outcomes of a project blast and workshop titled "Fab Labs and SDGs; the Next Round" focusing on cooperating with Multilateral Development Banks (MDBs)
# Authors
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment