Merge branch 'master' into testing

This commit is contained in:
anmol26s 2018-10-03 17:07:00 +05:30 committed by GitHub
commit 52fb7cc948
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 2 deletions

View File

@ -88,8 +88,6 @@ trending:
# strategy: 'recently-added' # Cache recently added videos
# minViews: 10 # Having at least x views
###############################################################################
#
# From this point, all the following keys can be overridden by the web interface