Chumva 2d78996344 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into LiveNowSorting ... # Conflicts: # OsmAnd-telegram/src/net/osmand/telegram/TelegramSettings.kt		2018-09-04 18:44:42 +03:00
..
res	Merge branch 'master' of ssh://github.com/osmandapp/Osmand into LiveNowSorting	2018-09-04 18:44:42 +03:00
src/net/osmand	Merge branch 'master' of ssh://github.com/osmandapp/Osmand into LiveNowSorting	2018-09-04 18:44:42 +03:00
.gitignore	Add the ability to use custom fonts with TextViewEx	2018-06-27 14:56:45 +03:00
AndroidManifest.xml	Fix OsmAnd-Telegram launcher icon	2018-08-06 13:38:30 +03:00
build.gradle	Update compileSdkVersion and support libs from 27 to 28 API	2018-08-09 16:51:58 +03:00