AdrianLxM bfd96b0635 Merge branch 'stable' into '1_5f' ... # Conflicts: # app/src/main/res/values/strings.xml		2017-07-29 16:55:55 +00:00
..
nightscout	Merge branch 'stable' into '1_5f'	2017-07-29 16:55:55 +00:00