dlvoy b40690d0c2 Merge branch 'dev' into feature/1806_remove_whitebar_wearos ... Resolved Conflicts in: [...]/watchfaces/Home.java [...]/watchfaces/Home2.java [...]/watchfaces/LargeHome.java		2019-11-28 06:37:32 +01:00
..
main	Merge branch 'dev' into feature/1806_remove_whitebar_wearos	2019-11-28 06:37:32 +01:00
test/java/info/nightscout/androidaps	[#2210][#728] Post-review refactoring (thanks @jotomo !)	2019-11-27 20:32:42 +01:00