Chumva a09dc0a280 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into TravelUiImprovements ... # Conflicts: # OsmAnd-telegram/res/values/strings.xml		2018-08-15 19:11:28 +03:00
..
attrs.xml	remove unnecessary call to editDate	2018-08-08 11:44:54 +03:00
colors.xml	polish ui and refactor continueButton	2018-07-06 18:47:47 +03:00
dimens.xml	Create DisconnectTelegramBottomSheet and related stuff	2018-08-14 22:37:35 +03:00
fonts.xml	Add "RobotoMono-Bold" font	2018-06-28 12:16:22 +03:00
strings.xml	Merge branch 'master' of ssh://github.com/osmandapp/Osmand into TravelUiImprovements	2018-08-15 19:11:28 +03:00
styles.xml	Create theme for BottomSheetDialog	2018-08-14 22:30:59 +03:00