Timo Volkmann 3721b4986c Merge branch 'frontend/kathy' into frontend/timo ... # Conflicts: # frontend/quasar.conf.js # frontend/src/router/routes.js		2019-03-24 12:44:48 +01:00
..
index.js	added frontend component, modified gradle.build	2019-03-19 23:01:54 +01:00
routes.js	Merge branch 'frontend/kathy' into frontend/timo	2019-03-24 12:44:48 +01:00