Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-01-06 17:12:38 +01:00
commit 462226bffb

View file

@ -2,7 +2,7 @@
<resources> <resources>
<string name="app_name">OsmAnd~</string> <string name="app_name">OsmAnd~</string>
<string name="app_name_free">OsmAndF~</string> <string name="app_name_free">OsmAndF~</string>
<string name="app_version">2.5.0</string> <string name="app_version">2.6.0</string>
<!-- <!--
Note: For our dev build apk's, the above "app_version" is provided (via osmand/build.xml) as the base version prefix to our build number in the format: Note: For our dev build apk's, the above "app_version" is provided (via osmand/build.xml) as the base version prefix to our build number in the format:
X.X.X#YYYYZ , where X.X.X#YYYYZ , where