Merge branch 'master' into master

2019-11-01 21:24:15 +08:00
parent 9663f7b473 b980538946
commit 460c6ee868
4 changed files with 1283 additions and 984 deletions
--- a/config.ini
+++ b/config.ini
@@ -18,7 +18,7 @@ update_check=1

 [media]
 media_warehouse=emby
-#emby or plex
+#emby or plex or kodi

 [directory_capture]
 directory=