Katharina Will e5f8f23b18 Resolved conflicts		2019-04-08 13:18:19 +02:00
..
index.js	added frontend component, modified gradle.build	2019-03-19 23:01:54 +01:00
routes.js	Resolved conflicts	2019-04-08 13:18:19 +02:00