Merge remote-tracking branch 'origin/issue_6499_timescale' into issue_6499_timescale

# Conflicts:
#	OsmAnd/res/values/strings.xml
This commit is contained in:
madwasp79 2019-02-28 16:02:26 +02:00
commit e8539c094b

View file

@ -11,6 +11,7 @@
Thx - Hardy Thx - Hardy
--> -->
<string name="time_of_day">Time of day</string> <string name="time_of_day">Time of day</string>
<string name="add_destination_query">Please add Destination first</string> <string name="add_destination_query">Please add Destination first</string>
<string name="shared_string_swap">Swap</string> <string name="shared_string_swap">Swap</string>