Commit Graph

6 Commits (20e66633a3440bb8390c22a627a6f76d07137174)

Author SHA1 Message Date
Felix Favre 4faca9864f Merge branch 'master' of github.com:planetcyborg/engelsystem
Conflicts:
	themes/theme1.scss
Philip Häusler f9e577352d remove html templates
Felix Favre 13994b7909 Changed Button Border Color in Dark Theme
Philip Häusler f30bc25246 minor bugfixes
Philip Häusler f5a094fd8b add user view, better bootstrap
Philip Häusler 74647e16d3 add basic bootstrap theme