Felix Favre 4faca9864f Merge branch 'master' of github.com:planetcyborg/engelsystem ... Conflicts: themes/theme1.scss		2014-08-24 15:52:25 +02:00
..
css	add moment js	2014-08-23 15:59:18 +02:00
js	added moment-countdown js file	2014-08-23 17:30:20 +02:00
pic	german update and style reset	2014-03-23 18:21:58 +01:00
vendor	remove html templates	2014-08-23 19:15:10 +02:00
bootstrap.php	added angeltype description	2014-03-09 13:12:46 +01:00
index.php	remove html templates	2014-08-23 17:24:11 +02:00