summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuliane Clausen <git@juliane-clausen.de>2013-07-17 21:36:20 +0200
committerJuliane Clausen <git@juliane-clausen.de>2013-07-17 21:36:20 +0200
commit4c6a717fdc8e94675a369dd698c801db55428033 (patch)
tree233eff363ee5a5699ecff22471481faee542511e
parent40d14680cedd7e2c13bacaba18e337f5066aa0f1 (diff)
parentcd1b6555eb801f4b6f5dc5de7df8ebc7dcaf21d4 (diff)
Merge branch 'master' of git+ssh://www-static.zrh.internetputzen.com/home/www/secret-cabal.ngas.ch/wiki
-rw-r--r--Namensvorschlaege/index.mdwn19
1 files changed, 19 insertions, 0 deletions
diff --git a/Namensvorschlaege/index.mdwn b/Namensvorschlaege/index.mdwn
index ced73c2e..3ba2b551 100644
--- a/Namensvorschlaege/index.mdwn
+++ b/Namensvorschlaege/index.mdwn
@@ -21,3 +21,22 @@ Widerspruch zu unserem Öffentlichkeitsanspruch steht.
* Happy Maker Friends
* Fixit Lab
* Mark I
+* Open Lab
+* Science Lab
+* Community Lab
+* Community Maker Lab
+* Area 51 / Area <PLZ_DES_ORT'S>
+* Makers Room
+* The Lab
+ * Könnte verwirren, denn in Luzern gibt es «Das Labor»
+* Starter Lab
+* 0 Mile Lab (Wie die beruemte Mile 0 in Key West der Route 1)
+* [Carsus](https://en.wikipedia.org/wiki/List_of_Doctor_Who_planets#C)
+* [Starfall](https://en.wikipedia.org/wiki/List_of_Doctor_Who_planets#S)
+* Kritisch, da wir nicht die einzigen Makerspaces in der Schweiz sind und die
+ anderen nicht vor den Kopf stossen wollen:
+ * Swiss Lab / Swiss Lab's
+ * Swiss Maker Lab
+ * Swiss Maker's
+ * The Swiss Lab
+ * The Swiss Open Lab