Merge branch 'master' into themes

Browse Source

...

This commit is contained in:

Michael Lazar

2017-12-07 20:55:44 -05:00

parent 9b4f73b063 31c7eadc3f

commit b69ee70366

35 changed files with 3996 additions and 298 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

resources/logo.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.4 KiB

BIN

resources/logo_black.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 12 KiB