Dima-1 ad6c0c420f Merge branch 'master' into fix_add_photos_button ... # Conflicts: # OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java		2020-11-23 23:03:32 +02:00
..
attrs.xml	Fix names, fix conflicts	2020-11-13 16:59:56 +02:00
colors.xml	Colors rename	2020-11-13 17:05:20 +02:00
dimens.xml	terrain ui fixes	2020-03-26 19:03:42 +02:00
fonts.xml
ids.xml	Added AV widget customization to configure screen	2020-02-17 19:22:35 +03:00
integer.xml	fix app bar shadow blink	2020-06-15 15:31:47 +03:00
phrases.xml	Update phrases	2020-11-17 18:47:50 +03:00
routepoints.xml
sizes.xml	Refactoring	2020-11-23 22:57:55 +02:00
strings.xml	conflict resolved	2020-11-23 11:02:02 +02:00
styles.xml	Colors rename	2020-11-13 17:05:20 +02:00