summaryrefslogtreecommitdiff
path: root/template/news/2011-11-03-growbox.html
AgeCommit message (Collapse)Author
2012-02-03Revert "Merge branch 'master' of sublab.org:website"Christian Franke
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.
2011-11-03fixed typo in a class img in news postsFlorian
2011-11-03fixed dotted line below images in newsFlorian
2011-11-03Fix typosBenjamin Kiessling
2011-11-03Growbox newsBenjamin Kiessling