Commit dc0880ab authored by echel0n's avatar echel0n

Merge branch 'master' into develop

# Conflicts:
#	.gitlab-ci.yml
#	package-lock.json
#	package.json
#	setup.cfg
#	sickrage/core/webserver/static/js/core.min.js
#	sickrage/version.txt
parents bf312949 f02ddfa3
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment