diff options
author | Philipp Wollschlegel <folken@kabelsalat.ch> | 2013-12-16 21:38:50 +0100 |
---|---|---|
committer | Philipp Wollschlegel <folken@kabelsalat.ch> | 2013-12-16 21:38:50 +0100 |
commit | 50f465d9ffa9afe4cb40615e0425980adc9a1b42 (patch) | |
tree | 9b2f8bdcff9adbc7e4632ae4e08700950d033006 /Interessenten/index.mdwn | |
parent | 1ad93d874fc3bd97abc077ade91ae9e2c0f40cb8 (diff) | |
parent | e5b1dfe9420c5ec1d6a36261004ba669144b5195 (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 'Interessenten/index.mdwn')
-rw-r--r-- | Interessenten/index.mdwn | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/Interessenten/index.mdwn b/Interessenten/index.mdwn deleted file mode 100644 index 1f15e98a..00000000 --- a/Interessenten/index.mdwn +++ /dev/null @@ -1,16 +0,0 @@ -[[!meta title="Wer und wer nicht?"]] - -# Wer? - -* Alvin -* Folken -* Juliane -* Caoimhe -* ... -* Engagierte Leute mit ähnlichen Interessen -* Geekige Künstler (Kunsthochschulen) - -# Wer nicht? - -* Leute, die andere ausbremsen -* Machthungrige Diktatoren |