website - The code for sublab.org

Age	Commit message (Collapse)	Author
2013-06-20	Remove vokue page, it's in the wiki now	Christian Franke

2013-04-19	added turmuhr projekt to projekte page	Florian

2013-04-15	updated projekte page	Florian

2012-02-22	Add link to aeroponics page	Benjamin Kiessling

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	comment out 404 links in projekte page	Florian

2012-01-12	added more projekte to projekte page	Florian

2012-01-12	added more projekte	Florian

2012-01-12	bug fix in projekte subpage	Florian

2012-01-12	added first content to projekte page	Florian

2012-01-12	updated keyqords for projekte page	Florian

2012-01-12	updated englisch descripton for projekte page	Florian

2012-01-12	updated projekte description in german	Florian

2012-01-12	added projekte folder	Florian

2011-11-30	bug fix in projekte subpage	Florian

2011-11-30	added first content to projekte page	Florian

2011-11-30	updated keyqords for projekte page	Florian

2011-11-30	updated englisch descripton for projekte page	Florian

2011-11-30	updated projekte description in german	Florian

2011-11-30	added projekte folder	Florian