Merge branch 'master' into develop

This commit is contained in:
Eliot Berriot 2019-03-21 11:31:16 +01:00
commit eae337d4ed
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
1 changed files with 1 additions and 1 deletions

View File

@ -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*