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 /Wunschliste/T-Shirt_Druck | |
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 'Wunschliste/T-Shirt_Druck')
-rw-r--r-- | Wunschliste/T-Shirt_Druck/index.mdwn | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Wunschliste/T-Shirt_Druck/index.mdwn b/Wunschliste/T-Shirt_Druck/index.mdwn deleted file mode 100644 index d23319a1..00000000 --- a/Wunschliste/T-Shirt_Druck/index.mdwn +++ /dev/null @@ -1,5 +0,0 @@ -* Shirtpresse (vorhanden, Juliane) -* Schneidplotter - * z.B. [CREATION PCUT CS630 (710MM) WITH OPTICAL EYE](http://www.ukcutter.co.uk/index.php?route=product/product&path=35_71&product_id=91) -* Entgitterwerkzeug -* Verbrauchsmaterial |