Merge branch 'master' into develop

eae337d4 · Eliot Berriot · e587e5ae · 65dd21d1 · eae337d4
Verified Commit eae337d4 authored 5 years ago by Eliot Berriot
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,7 +18,7 @@ https://docs.funkwhale.audio/index.html


 Avoid mixed content when deploying mono-container behind proxy [Manual action required]
---------------------------------------------------------------------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

 *You are only concerned if you use the mono-container docker deployment behind a reverse proxy*