Felix Favre 4faca9864f Merge branch 'master' of github.com:planetcyborg/engelsystem ... Conflicts: themes/theme1.scss		2014-08-24 15:52:25 +02:00
..
guest_credits.html	e7p added to credits	2014-01-06 18:55:19 +01:00
layout.html	Moved Javascript includes to bottom of layout	2014-08-23 17:31:20 +02:00
user_shifts.html	add basic bootstrap theme	2014-08-22 22:34:13 +02:00