Rob Weber 65ea3c98c4 Merge branch 'master' into krypton
# Conflicts:
#	addon.xml
#	icon.png
#	resources/images/icon.png
#	resources/media/icon.png
#	scheduler.py
2019-08-20 11:29:14 -05:00
..
2017-12-29 13:25:40 -06:00
2019-08-19 15:34:32 -05:00
2012-10-22 13:53:01 -05:00
2012-10-22 13:53:01 -05:00
2019-02-04 11:57:36 -06:00
2017-01-30 12:51:36 -06:00
2019-08-20 11:29:14 -05:00
2017-12-29 13:22:49 -06:00