Johannes Mockenhaupt 2946e2a485 Merge remote-tracking branch 'swissalpine/patch-2' into combo-scripter-v2 ... * swissalpine/patch-2: Update strings.xml # Conflicts: # app/src/main/res/values-de/strings.xml		2018-01-03 16:26:35 +01:00
..
libs	first rhino	2017-10-15 02:52:57 +02:00
src	Merge remote-tracking branch 'swissalpine/patch-2' into combo-scripter-v2	2018-01-03 16:26:35 +01:00
.gitignore	Objectives design	2016-06-04 17:28:05 +02:00
build.gradle	Merge remote-tracking branch 'origin/dev' into csv2-staging	2017-12-25 20:29:32 +01:00
fabric.properties	add bg language	2016-07-05 20:28:23 +02:00
proguard-rules.pro	plugins refactoring	2016-08-05 23:54:03 +02:00