Merge remote-tracking branch 'origin/config-update' into config-update

# Conflicts:
#	README.md
#	config.ini
#	requirements.txt
This commit is contained in:
Blacktwin 2018-03-14 10:07:04 -04:00
commit ac17b846bf

View File

@ -2,8 +2,8 @@
[plex]
url = http://localhost:32400
token = rFr9327dn1JepuTA5o4U
token = xxxx
[tautulli]
url = http://localhost:8183/
api = 56953cf8a660652acb20ce40c90f2b19
url = http://localhost:8181/
api = xxxx