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
..
attrs.xml	remove unnecessary call to editDate	2018-08-08 11:44:54 +03:00
colors.xml	Add sorting to live now fragment	2018-09-03 19:23:57 +03:00
dimens.xml	Merge branch 'master' of ssh://github.com/osmandapp/Osmand into LiveNowSorting	2018-09-04 18:44:42 +03:00
fonts.xml	Add "RobotoMono-Bold" font	2018-06-28 12:16:22 +03:00
strings.xml	Add sorting to live now fragment	2018-09-03 19:23:57 +03:00
styles.xml	fix status bar transparent color	2018-08-23 15:03:59 +03:00