summaryrefslogtreecommitdiff
path: root/template/topic
AgeCommit message (Collapse)Author
2012-02-29added sublounge to topicFlorian
2012-02-25changed topic to rohre freiFlorian
2012-02-05changed topic to cancel all eventsFlorian
2012-02-03no phantomspeisung topicFlorian
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.
2012-02-02added newlineskloschi klosch
2012-02-02removed == fragmentskloschi klosch
2012-02-02added streamlinkkloschi klosch
2012-02-02Merge branch 'master' of sublab.org:websitekloschi 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-23Update TopicBenjamin Kiessling
2012-01-17Update topicBenjamin Kiessling
2012-01-12Update topicBenjamin Kiessling
2012-01-12Update topicBenjamin Kiessling
2012-01-12added silvesterlounge to topicFlorian
2012-01-12delted wotorwoerld from topicFlorian
2012-01-12updated topicFlorian
2012-01-12updated topic for wotorwoerldFlorian
2012-01-12updatet topic for outside the boxFlorian
2012-01-12updated topicFlorian
2012-01-12updated topicFlorian
2012-01-12stream addeda klosch
2012-01-12commented stream in topica klosch
2012-01-12added stream to sublounge @template/topic added br bra klosch
2012-01-12added stream to sublounge @template/topic againa klosch
2012-01-12added stream to sublounge @template/topica klosch
2011-12-08Merge branch 'master' of sublab.org:websitea klosch
Conflicts: template/topic/topic
2011-12-08stream addeda klosch
2011-12-03updated topicFlorian
2011-11-30updated topicFlorian
2011-11-11commented stream in topica klosch
2011-11-10added stream to sublounge @template/topic added br bra klosch
2011-11-10added stream to sublounge @template/topic againa klosch
2011-11-10added stream to sublounge @template/topica klosch
2011-11-02Update topicChristian Franke
2011-10-27Add livestreamChristian Franke
2011-10-08place new template scriptChristian Franke