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

Browse source

# Conflicts:
#	OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java

...

This commit is contained in:

madwasp79 2019-01-28 15:33:32 +02:00

parent 4f7c662bc9 07f839d408

commit 56c2dc60ba

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available