Merge branch 'release-11.7' into nightly

# Conflicts:
#	changelog.txt
#	core/versionCheck.py
#	nzbToMedia.py
This commit is contained in:
Lizband 2018-12-25 14:39:31 -05:00
commit d1edf9f2a2
6 changed files with 104 additions and 43 deletions

View file

@ -623,6 +623,9 @@
from __future__ import print_function
import cleanup
cleanup.clean('core', 'libs')
import datetime
import os
import sys