Merge branch 'master' into themes

Browse Source

...

This commit is contained in:

Michael Lazar committed 2017-12-07 20:55:44 -05:00

2 parents 9b4f73b063 31c7eadc3f

commit b69ee70366

35 files changed

+3996 -298

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

No files matched your search

resources/logo.png

BIN

Binary file not shown.

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

resources/logo_black.png

BIN

Binary file not shown.

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