Commit Graph

11 Commits

Author SHA1 Message Date
koeart 7f37c28417 artikel neues internet in schleuder aufgenommen 2017-02-20 22:50:05 +01:00
Benjamin Kellermann 95ef4f6ace fix typo 2017-02-20 22:06:12 +01:00
Benjamin Kellermann 52cbd99b27 Merge with upstream 2017-02-20 21:56:07 +01:00
koeart 1fa6be8307 Merge branch 'master' of git.c3d2.de:datenschleuder98 2017-02-20 21:55:11 +01:00
koeart 4ebe709269 artikel imminenfeld 2017-02-20 21:40:27 +01:00
John ea43a4acd3 fixed merge bug 2017-02-20 21:36:05 +01:00
John 8503249540 Merge branch 'master' of git.c3d2.de:datenschleuder98 2017-02-20 21:10:29 +01:00
Benjamin Kellermann e73b39db88 use correct picture 2017-02-20 21:08:36 +01:00
John 780c99e69a free edition is default 2017-02-20 21:08:32 +01:00
Benjamin Kellermann b4698b7b77 remove old pictures 2017-02-20 21:06:58 +01:00
John 6fd7025d15 moved from old git 2017-02-20 20:44:09 +01:00