| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2012-02-03 | Revert "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. | |||
| 2012-02-02 | Merge branch 'master' of sublab.org:website | kloschi klosch | |
| Conflicts: public/img/onewire/digitemp.jpg template/news/2011-12-07-frieren.html template/pages/projekte/content.html template/pages/verein/content.html template/pages/vokue/content.html template/template/template.html template/topic/topic | |||
| 2012-01-12 | added phantomspeisung projekte page | Florian | |
| 2012-01-12 | moved phantomspeisung page to exploit rewrite rule on server | Florian | |
| 2011-12-04 | moved phantomspeisung page to exploit rewrite rule on server | Florian | |
 |
index : website | |
| The code for sublab.org | sublab |
| summaryrefslogtreecommitdiff |