Merge branch 'patch-1' into dev

Browse Source

...

This commit is contained in:

Dannon Baker

2017-12-20 08:35:09 -05:00

parent ee6512ee8a 1b301ba604

commit 7eae6bf061

3 changed files with 173 additions and 98 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

static/scripts/bundled/libs.bundled.js

+1 -1

File diff suppressed because one or more lines are too long

static/scripts/nls/zh/locale.js

+1 -1

File diff suppressed because one or more lines are too long