Dima-1 4d5dcc2246 Merge branch 'master' into Fix_2_edit_fav_icons ... # Conflicts: # OsmAnd/res/values/strings.xml		2020-04-16 17:36:02 +03:00
..
phrases.xml	Translated using Weblate (Portuguese (Brazil))	2020-03-17 07:17:49 +01:00
strings.xml	Merge branch 'master' into Fix_2_edit_fav_icons	2020-04-16 17:36:02 +03:00