7ebbc46a40
# Conflicts: # OsmAnd-telegram/res/values/strings.xml |
||
---|---|---|
.. | ||
res | ||
src/net/osmand | ||
.gitignore | ||
AndroidManifest.xml | ||
build.gradle |
7ebbc46a40
# Conflicts: # OsmAnd-telegram/res/values/strings.xml |
||
---|---|---|
.. | ||
res | ||
src/net/osmand | ||
.gitignore | ||
AndroidManifest.xml | ||
build.gradle |