Felix Favre 20e66633a3 Merge branch 'master' of github.com:planetcyborg/engelsystem ... Conflicts: templates/layout.html		2014-08-24 16:55:26 +02:00
..
guest_credits.html	e7p added to credits	2014-01-06 18:55:19 +01:00
layout.html	Merge branch 'master' of github.com:planetcyborg/engelsystem	2014-08-24 16:55:26 +02:00
user_shifts.html	add basic bootstrap theme	2014-08-22 22:34:13 +02:00