summaryrefslogtreecommitdiff
path: root/template/news/2012-02-1-rapman.html
diff options
context:
space:
mode:
authorChristian Franke <nobody@nowhere.ws>2012-02-03 02:06:37 +0100
committerChristian Franke <nobody@nowhere.ws>2012-02-03 02:06:37 +0100
commitc1fe26e9c3a1f6d26ff5b653150deacf56c45b7c (patch)
tree0eeefc08367387fb64689607cacd2ebf3ae9c1b0 /template/news/2012-02-1-rapman.html
parent5826a58c7c3ca812f409663c30d46ff5b125957d (diff)
Revert "Merge branch 'master' of sublab.org:website"
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.
Diffstat (limited to 'template/news/2012-02-1-rapman.html')
0 files changed, 0 insertions, 0 deletions