Weblate 2aa8af059b Merge remote-tracking branch 'origin/master' ... Conflicts: OsmAnd/res/values-de/strings.xml		2014-12-01 11:03:43 +01:00
..
bidforfix.xml	testing the crlf, fromdos the xml	2012-05-31 09:51:43 +02:00
strings.xml	Merge remote-tracking branch 'origin/master'	2014-12-01 11:03:43 +01:00