Felix Favre 20e66633a3 Merge branch 'master' of github.com:planetcyborg/engelsystem ... Conflicts: templates/layout.html		2014-08-24 16:55:26 +02:00
..
forms.js	add moment js	2014-08-23 15:59:18 +02:00
moment-countdown.js	Countdown implementation	2014-08-24 16:44:36 +02:00