diff options
| author | root <root@krebs> | 2011-09-01 02:18:42 +0200 |
|---|---|---|
| committer | root <root@krebs> | 2011-09-01 02:18:42 +0200 |
| commit | bb2a234ba756eb600fb6f562e67500d511d4ab39 (patch) | |
| tree | c89b205e3ad2d20e3aa80ca525e0bbf1e01b4670 /cholerab/shirts | |
| parent | 8a6fd84c70618f5a435d2859b513de6de68dc0d1 (diff) | |
| parent | 4fb37da707279faf92cc8a054c646336f23dfdbe (diff) | |
Merge branch 'master' of github.com:/krebscode/painload
Conflicts:
.gitmodules
oncology/dpfhack_display
Diffstat (limited to 'cholerab/shirts')
| -rw-r--r-- | cholerab/shirts/bestellliste | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cholerab/shirts/bestellliste b/cholerab/shirts/bestellliste index f775514e..f1f423e1 100644 --- a/cholerab/shirts/bestellliste +++ b/cholerab/shirts/bestellliste @@ -1,5 +1,5 @@ # S G∃ Feedback -tv 2 M j- +tv 2 M jj Superdick aufgetragenes Gummifetisch Logo; Farbe: genial 1 S j- ulrich 1 M ?j gut felix 2 M jj super qualitaet, sogar nach dem waschen kein bisschen ausgebleicht |