Merge branch 'riclas-patch-6'

Browse source

...

This commit is contained in:

Manfred Karrer 2017-09-30 13:16:35 -05:00

parent e6498e2659 ae4212c567

commit 99dc2f710a

No known key found for this signature in database

GPG key ID: 401250966A6B2C46

1 changed files with 1504 additions and 0 deletions

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

1504

common/src/main/resources/i18n/displayStrings_zh_cn.properties Normal file

View file

File diff suppressed because it is too large Load diff