Merge branch 'stable-1.1'

Browse Source

Conflicts:
	data/locale/zh.ts

...

This commit is contained in:

Vesa

2014-11-18 10:52:40 +02:00

parent e6938994cd 09771174f4

commit 6f963159df

3 changed files with 683 additions and 676 deletions

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

Download Patch File Download Diff File Expand all files Collapse all files

1321

data/locale/zh.ts

File diff suppressed because it is too large Load Diff