Commit Graph

39 Commits

Author SHA1 Message Date
koeart
3f03b0dc67 fix 2017-02-20 22:45:54 +01:00
koeart
2019aa334d Merge branch 'master' of git.c3d2.de:datenschleuder98 2017-02-20 22:44:07 +01:00
koeart
fd716a9767 Merge branch 'master' of git.c3d2.de:datenschleuder98 2017-02-20 22:43:37 +01:00
koeart
cedd72857d Artikel: neues internet von Clauda 2017-02-20 22:42:25 +01:00
Benjamin Kellermann
666ad22d18 Merge with upstream 2017-02-20 22:42:13 +01:00
koeart
95cdde45b2 Artikel: neues internet von Clauda 2017-02-20 22:41:48 +01:00
Benjamin Kellermann
9fb3156de6 artikel schöner gesetzt 2017-02-20 22:41:03 +01:00
koeart
c93a423342 gitignore update 2017-02-20 22:26:27 +01:00
koeart
872353d3a5 Merge branch 'master' of git.c3d2.de:datenschleuder98 2017-02-20 22:24:36 +01:00
koeart
6d28ecec3e quelle für bilder mit lizenz 2017-02-20 22:24:26 +01:00
koeart
a5fc08100c Bild fuer Artikel Polemik Gesundheitskarte 2017-02-20 22:24:04 +01:00
koeart
84671891bf artikel polemik gesundheitskarte 2017-02-20 22:23:38 +01:00
Benjamin Kellermann
c54aa1672f Leserbriefe angepasst 2017-02-20 22:22:20 +01:00
Benjamin Kellermann
eeb65c3e90 bugfix typo 2017-02-20 22:06:32 +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
cfce452d13 Merge git://172.20.76.136 2017-02-20 21:36:30 +01:00
John
ea43a4acd3 fixed merge bug 2017-02-20 21:36:05 +01:00
Benjamin Kellermann
97df9fd456 Schleuder hat Abhängigkeit zu Artikeln 2017-02-20 21:35:42 +01:00
John
b75cc076ca Merge git://172.22.99.102 2017-02-20 21:31:30 +01:00
koeart
94800394d5 artikel: Im minenfeld 2017-02-20 21:13:25 +01:00
John
c7a2d5518d mod submodule schleuderpackung 2017-02-20 21:13:14 +01:00
John
195ecae1d8 Merge branch 'master' of git.c3d2.de:datenschleuder98 2017-02-20 21:12:00 +01:00
Benjamin Kellermann
29a169a80c use newest schleuderpackung 2017-02-20 21:11:41 +01:00
John
8503249540 Merge branch 'master' of git.c3d2.de:datenschleuder98 2017-02-20 21:10:29 +01:00
John
d9d36397d0 Merge branch 'master' of git.c3d2.de:datenschleuder98 2017-02-20 21:09:03 +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
Benjamin Kellermann
b032deb687 title img 2017-02-20 21:02:00 +01:00
Benjamin Kellermann
8c5432e494 datenschleuder.cls ignored 2017-02-20 21:01:38 +01:00
Benjamin Kellermann
7444049684 gitignore added 2017-02-20 21:00:13 +01:00
Benjamin Kellermann
ef79474b63 init target in Makefile 2017-02-20 20:53:49 +01:00
John
c04db70c2a new submodule commit schleuderpackung 2017-02-20 20:48:42 +01:00
John
83653607c8 moved articles from old git 2017-02-20 20:47:33 +01:00
John
6fd7025d15 moved from old git 2017-02-20 20:44:09 +01:00
John
3239ae5655 init... submodule added 2017-02-20 20:41:26 +01:00