Alexander Sytnyk 4e134d0292 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into menu_behavior ... # Conflicts: # OsmAnd/res/values-large/sizes.xml # OsmAnd/res/values/colors.xml # OsmAnd/res/values/sizes.xml		2018-01-11 15:36:32 +02:00
..
sizes.xml	Merge branch 'master' of ssh://github.com/osmandapp/Osmand into menu_behavior	2018-01-11 15:36:32 +02:00