Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x

Browse Source

...

This commit is contained in:

zhaohaibo

2020-05-26 13:33:33 +08:00

parent d5a80a5718 2a44b295af

commit ee52389234

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

BIN

www/theme/zui/fonts/ZentaoIcon.eot Executable file → Normal file

Binary file not shown.

6

www/theme/zui/fonts/ZentaoIcon.svg Executable file → Normal file

File diff suppressed because one or more lines are too long

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 124 KiB After Width:  |  Height:  |  Size: 132 KiB

BIN

www/theme/zui/fonts/ZentaoIcon.ttf Executable file → Normal file

Binary file not shown.

BIN

www/theme/zui/fonts/ZentaoIcon.woff Executable file → Normal file

Binary file not shown.