Johannes Mockenhaupt f6c5b95904 Merge remote-tracking branch 'origin/master' into combo-scripter-v2 ... * origin/master: Revert "Update strings.xml" bump 1.58 Update strings.xml Add issue template. Enhance insulin plugin test filter null BT devices BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete. BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete. ES translations Dana plugin refactoring KO language cleanup Update strings.xml Update strings.xml Bg translation add RO language CS translations ButterKnife to Dana fragment bump 1.57a-dev Add a unit test for Insulin Plugin # Conflicts: # app/build.gradle # app/src/main/res/values-de/strings.xml # app/src/main/res/values-nl/strings.xml # app/src/main/res/values/strings.xml		2018-02-03 16:45:29 +01:00
..
libs	wear add clockwise lib	2016-11-26 14:21:01 +01:00
src/main	BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete.	2018-01-29 23:34:03 +01:00
.gitignore	fix gitignore	2017-02-11 01:50:25 +01:00
build.gradle	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2018-01-13 23:18:44 +01:00
proguard-rules.pro	wear installing on watch	2016-11-24 16:23:31 +01:00