veliymolfar 0470f93284 Merge remote-tracking branch 'origin/master' into import_screen ... # Conflicts: # OsmAnd/res/values/strings.xml		2020-02-14 11:23:42 +02:00
..
attrs.xml	complex button / import layouts	2020-02-12 18:54:25 +02:00
colors.xml	Navbar color: black in light and dark	2020-02-04 18:37:06 +02:00
dimens.xml	Refactoring mapillary controls	2017-05-04 23:48:07 +03:00
fonts.xml
ids.xml	Add compass ruler control initial commit	2019-05-24 18:19:51 +03:00
phrases.xml	Fix https://github.com/osmandapp/Osmand/issues/8336 (change organic phrase)	2020-02-05 16:24:55 +03:00
routepoints.xml
sherpafy.xml
sizes.xml	small fixes p.2	2020-02-06 16:19:38 +02:00
strings.xml	Merge remote-tracking branch 'origin/master' into import_screen	2020-02-14 11:23:42 +02:00
styles.xml	Fix text appearance text color	2019-11-04 10:31:34 +02:00