madwasp79 cd8959d114 Merge branch 'master' into app_profiles ... # Conflicts: # OsmAnd/res/values/strings.xml		2019-05-21 16:37:22 +03:00
..
java	Merge branch 'master' into app_profiles	2019-05-21 16:37:22 +03:00