Johannes Mockenhaupt 7d4d6374be Merge branch 'combo-strings' into combo-scripter-v2 ... * combo-strings: Add strings for the Combo pump, including some renames. # Conflicts: # app/src/main/res/values/strings.xml		2018-01-11 21:48:01 +01:00
..
libs	first rhino	2017-10-15 02:52:57 +02:00
src	Merge branch 'combo-strings' into combo-scripter-v2	2018-01-11 21:48:01 +01:00
.gitignore	Objectives design	2016-06-04 17:28:05 +02:00
build.gradle	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2018-01-11 17:50:07 +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