Commit Graph

5 Commits

Author SHA1 Message Date
Felix Favre 20e66633a3 Merge branch 'master' of github.com:planetcyborg/engelsystem
Conflicts:
	templates/layout.html
2014-08-24 16:55:26 +02:00
Felix Favre 88dfb2e3a8 Countdown implementation 2014-08-24 16:44:36 +02:00
Philip Häusler abb6d8bfd8 move moment js to vendor 2014-08-24 16:09:56 +02:00
Felix Favre 3a7893fb33 added moment-countdown js file 2014-08-23 17:30:20 +02:00
Philip Häusler 6bfa410f90 add moment js 2014-08-23 15:59:18 +02:00