Merge branch 'release/0.17'

007d1f7f · Eliot Berriot · 9d3b92bc · dc1e4fb0 · 007d1f7f · 007d1f7f
Verified Commit 007d1f7f authored 6 years ago by Eliot Berriot
--- a/api/tests/subsonic/test_serializers.py
+++ b/api/tests/subsonic/test_serializers.py
--- a/api/tests/subsonic/test_views.py
+++ b/api/tests/subsonic/test_views.py
--- a/api/tests/test_downloader.py
+++ b/api/tests/test_downloader.py
--- a/api/tests/test_import_audio_file.py
+++ b/api/tests/test_import_audio_file.py
--- a/api/tests/test_youtube.py
+++ b/api/tests/test_youtube.py
--- a/api/tests/users/test_ldap.py
+++ b/api/tests/users/test_ldap.py
--- a/api/tests/users/test_models.py
+++ b/api/tests/users/test_models.py
--- a/changes/template.rst
+++ b/changes/template.rst
--- a/demo/setup.sh
+++ b/demo/setup.sh
--- a/deploy/FreeBSD/README.md
+++ b/deploy/FreeBSD/README.md
--- a/deploy/FreeBSD/funkwhale_beat
+++ b/deploy/FreeBSD/funkwhale_beat
--- a/deploy/FreeBSD/funkwhale_server
+++ b/deploy/FreeBSD/funkwhale_server
--- a/deploy/FreeBSD/funkwhale_worker
+++ b/deploy/FreeBSD/funkwhale_worker
--- a/deploy/docker-compose.yml
+++ b/deploy/docker-compose.yml
--- a/deploy/docker.funkwhale_proxy.conf
+++ b/deploy/docker.funkwhale_proxy.conf
--- a/deploy/docker.nginx.template
+++ b/deploy/docker.nginx.template
--- a/deploy/docker.proxy.template
+++ b/deploy/docker.proxy.template
--- a/deploy/env.prod.sample
+++ b/deploy/env.prod.sample
--- a/deploy/nginx.conf
+++ b/deploy/nginx.conf
--- a/dev.yml
+++ b/dev.yml