summaryrefslogtreecommitdiff
path: root/Kooperationen/FabLab_Zurich/index.mdwn
diff options
context:
space:
mode:
authorPhilipp Wollschlegel <folken@kabelsalat.ch>2013-12-16 21:38:50 +0100
committerPhilipp Wollschlegel <folken@kabelsalat.ch>2013-12-16 21:38:50 +0100
commit50f465d9ffa9afe4cb40615e0425980adc9a1b42 (patch)
tree9b2f8bdcff9adbc7e4632ae4e08700950d033006 /Kooperationen/FabLab_Zurich/index.mdwn
parent1ad93d874fc3bd97abc077ade91ae9e2c0f40cb8 (diff)
parente5b1dfe9420c5ec1d6a36261004ba669144b5195 (diff)
Merge branch 'master' of git+ssh://www-static.zrh.internetputzen.com/home/www/wiki.starship-factory.ch/wiki
Conflicts: index.mdwn
Diffstat (limited to 'Kooperationen/FabLab_Zurich/index.mdwn')
-rw-r--r--Kooperationen/FabLab_Zurich/index.mdwn6
1 files changed, 0 insertions, 6 deletions
diff --git a/Kooperationen/FabLab_Zurich/index.mdwn b/Kooperationen/FabLab_Zurich/index.mdwn
deleted file mode 100644
index f201eb8e..00000000
--- a/Kooperationen/FabLab_Zurich/index.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-# Fotos
-
-* [Set von Juliane](http://www.flickr.com/photos/julianeclausen/sets/72157634691815937/)
-
-# Treffen
-* [[Treffen 18. Juli 2013|Kooperationen/FabLab Zurich/Notizen 2013-07-18]]