Merge remote-tracking branch 'origin/3.1' into 3.2

Browse Source

Conflicts:
	lang/cs.yml
	lang/de.yml
	lang/en.yml
	lang/es.yml
	lang/fr.yml
	lang/id.yml
	lang/it.yml
	lang/lt.yml
	lang/nb.yml
	lang/sk.yml
	lang/sr_RS@latin.yml
	lang/sv.yml

...

This commit is contained in:

Damian Mooyman 2015-09-15 12:48:48 +12:00

parent f2efbefb8c 6e72bd2cf8

commit e382818399

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 Not Available