Alexander Sytnyk 58b1c20219 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into wikivoyage ... # Conflicts: # OsmAnd/res/values/strings.xml		2018-03-28 12:42:50 +03:00
..
attrs.xml	Delete unused strings #4997	2018-03-08 10:15:36 +01:00
colors.xml	Delete unused strings #4997	2018-03-08 10:15:36 +01:00
dimens.xml
fonts.xml
ids.xml	Change the radius of the circles; remove the selection of modes from configure screen	2017-07-12 14:02:45 +03:00
phrases.xml	Add phrases	2018-03-26 12:02:14 +03:00
routepoints.xml
sherpafy.xml
sizes.xml	Replace GridView with custom keyboard layout	2018-02-21 18:42:49 +02:00
strings.xml	Merge branch 'master' of ssh://github.com/osmandapp/Osmand into wikivoyage	2018-03-28 12:42:50 +03:00
styles.xml	Delete unused strings #4997	2018-03-08 10:15:36 +01:00