Merge branch 'update-supported-formats' into 'develop'

Document support for AIFF format

See merge request funkwhale/funkwhale!1243

docs/admin/importing-music.rst

@@ -67,7 +67,7 @@ get details::
 
 .. note::
 
-    At the moment, only Flac, OGG/Vorbis and MP3 files with ID3 tags are supported
+    At the moment, only Flac, OGG/Vorbis and MP3 or AIFF files with ID3 tags are supported
 
 
 

front/src/components/library/FileUpload.vue

@@ -49,7 +49,7 @@
               <a href="http://picard.musicbrainz.org/" target='_blank'><translate translate-context="Content/Library/Link">We recommend using Picard for that purpose.</translate></a>
             </li>
             <li>
-              <translate translate-context="Content/Library/List item">The music files you are uploading are in OGG, Flac or MP3 format</translate>
+              <translate translate-context="Content/Library/List item">The music files you are uploading are in OGG, Flac, MP3 or AIFF format</translate>
             </li>
           </ul>
         </div>