Merge remote-tracking branch 'origin/master'

Browse source

Conflicts:
	OsmAnd/res/values-ca/strings.xml

...

This commit is contained in:

Weblate 2015-03-13 10:24:29 +01:00

parent 317b44ca9a 300f4ed5a6

commit fa8ca6dc49

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available