5 Commits

Author SHA1 Message Date
a56ab9cadd Merge remote-tracking branch 'origin/developer' into developer
# Conflicts:
#	public/index.html
#	public/routes/navRoutes.js
2019-07-19 15:34:10 +02:00
a4da6243f5 few style changes 2019-07-19 15:28:26 +02:00
Edwina Barbalan
373d644134 Desktopansicht angepasst 2019-07-19 11:54:13 +02:00
Edwina Barbalan
6c9cb12480 Navbar is-active colorchange 2019-07-09 10:43:05 +02:00
Edwina Barbalan
9375316956 Router Componente erstellt / Navbar bearbeitet 2019-07-02 14:59:11 +02:00