website/template/news/2011-11-03-growbox.html, branch master The code for sublab.org Revert "Merge branch 'master' of sublab.org:website" 2012-02-03T01:06:37+00:00 Christian Franke nobody@nowhere.ws 2012-02-03T01:06:37+00:00 c1fe26e9c3a1f6d26ff5b653150deacf56c45b7c This reverts commit 76f5eb72cda67da497ea4ba992778661559f26b4, reversing changes made to 002ccb53e6319619d503972c2a6bad0d4ead0c6f. Conflicts: template/topic/topic Guys, please learn how to use git. Have a look at $ git diff origin/master master and check if it looks reasonable. Also, if there is a merge in the history, in our case, it is almost always bad. When you pull, use $ git pull --rebase --ff-only and not just a pull without arguments. 
This reverts commit 76f5eb72cda67da497ea4ba992778661559f26b4, reversing
changes made to 002ccb53e6319619d503972c2a6bad0d4ead0c6f.

Conflicts:

	template/topic/topic

Guys, please learn how to use git. Have a look at

    $ git diff origin/master master

and check if it looks reasonable. Also, if there is a merge in the
history, in our case, it is almost always bad. When you pull, use

    $ git pull --rebase --ff-only

and not just a pull without arguments.
fixed typo in a class img in news posts 2011-11-03T12:39:33+00:00 Florian florianraemisch@web.de 2011-11-03T12:39:33+00:00 99e63336220c0bfcc31067c604900347aeb411d9 






fixed dotted line below images in news
2011-11-03T12:35:49+00:00

Florian
florianraemisch@web.de

2011-11-03T12:35:49+00:00

53f8d303e7079fe3087578caad2abf260ff38017












Fix typos
2011-11-03T02:10:54+00:00

Benjamin Kiessling
mittagessen@l.unchti.me

2011-11-03T02:10:54+00:00

68ecf5ba78a09876f2e087137ac7cb495cfb3f3a












Growbox news
2011-11-02T23:00:49+00:00

Benjamin Kiessling
mittagessen@l.unchti.me

2011-11-02T23:00:49+00:00

9a4bee5e8376d49445ef5052a1a8f9ff51051d53