Merge branch 'master' into krypton

Browse Source

# Conflicts:
#	addon.xml
#	icon.png
#	resources/images/icon.png
#	resources/media/icon.png
#	scheduler.py

...

This commit is contained in:

Rob Weber

2019-08-20 11:29:14 -05:00

parent 4108f333e2 ee2f38e865

commit 65ea3c98c4

12 changed files with 101 additions and 129 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/images/icon.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 8.9 KiB