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
..
assets	[#728] Complication support - Watch OS selection of Short, Long and Image complications with current AAPS status (SGV, trend, delta, BR, IoB, CoB, phone/uploader battery)	2019-11-15 11:23:50 +01:00
java/info/nightscout/androidaps	Merge branch 'dev' into feature/1806_remove_whitebar_wearos	2019-11-28 06:37:32 +01:00
res	Merge branch 'dev' into feature/1806_remove_whitebar_wearos	2019-11-28 06:37:32 +01:00
AndroidManifest.xml	[#728] Fix for complications update period (from @jotomo review)	2019-11-26 09:30:27 +01:00