Johannes Mockenhaupt 20c218ae9a Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Overview: move checkboxes before label. fix pump unreachable for virtual pump getLastAutosensData improvement and logging remove readstatus prior every command bump 1.57-dev better log build verison to Fabric # Conflicts: # app/build.gradle		2018-01-19 21:05:37 +01:00
..
libs	first rhino	2017-10-15 02:52:57 +02:00
src	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2018-01-19 21:05:37 +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-19 21:05:37 +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