Merge branch 'master' into develop

2019-03-21 11:31:16 +01:00 · 2019-03-21 11:31:16 +01:00 · eae337d4ed
commit eae337d4ed
--- a/2
+++ b/2
@ -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*