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 /Equipment/T-Shirt-Presse | |
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 'Equipment/T-Shirt-Presse')
-rw-r--r-- | Equipment/T-Shirt-Presse/img_DSC_4746_0001.jpg | bin | 0 -> 193044 bytes | |||
-rw-r--r-- | Equipment/T-Shirt-Presse/img_DSC_4747_0002.jpg | bin | 0 -> 224451 bytes | |||
-rw-r--r-- | Equipment/T-Shirt-Presse/index.mdwn | 5 |
3 files changed, 5 insertions, 0 deletions
diff --git a/Equipment/T-Shirt-Presse/img_DSC_4746_0001.jpg b/Equipment/T-Shirt-Presse/img_DSC_4746_0001.jpg Binary files differnew file mode 100644 index 00000000..c9e64ff3 --- /dev/null +++ b/Equipment/T-Shirt-Presse/img_DSC_4746_0001.jpg diff --git a/Equipment/T-Shirt-Presse/img_DSC_4747_0002.jpg b/Equipment/T-Shirt-Presse/img_DSC_4747_0002.jpg Binary files differnew file mode 100644 index 00000000..49dc9736 --- /dev/null +++ b/Equipment/T-Shirt-Presse/img_DSC_4747_0002.jpg diff --git a/Equipment/T-Shirt-Presse/index.mdwn b/Equipment/T-Shirt-Presse/index.mdwn new file mode 100644 index 00000000..64946cc6 --- /dev/null +++ b/Equipment/T-Shirt-Presse/index.mdwn @@ -0,0 +1,5 @@ +[[Benutzer/Juliane]] hat eine [TRANSFERPRESSE TP1400 von Dema](http://www.dema-vertrieb.ch/index.php/de/Transferpresse,TP1400/c,KAT0209/a,17234), mit der man Flex- und Flockfolien auf Textilien fixieren kann. Diese gehört zum Projekt [[Equipment/T-shirt_Druck]]. + +[[!img img_DSC_4746_0001.jpg align="left" size="x300" alt="T-Shirtpresse geschlossen" class="imgwithborder"]] +[[!img img_DSC_4747_0002.jpg align="left" size="x300" alt="T-Shirtpresse geöffnet" class="imgwithborder"]] +<br clear="all"/> |