You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Felix Favre 20e66633a3 Merge branch 'master' of github.com:planetcyborg/engelsystem
Conflicts:
	templates/layout.html
11 years ago
..
css add moment js 11 years ago
js Merge branch 'master' of github.com:planetcyborg/engelsystem 11 years ago
pic german update and style reset 11 years ago
vendor move moment js to vendor 11 years ago
bootstrap.php added angeltype description 11 years ago
index.php remove html templates 11 years ago