Merge tag '0.6.1' into develop

0.6.1 (unreleased)
------------------

Features:

- Can now skip acoustid on file import with the --no-acoustid flag (#111)

Bugfixes:

- Added missing batch id in output during import (#112)
- Added some feedback on the play button (#100)
- Smarter pagination which takes a fixed size (#84)

Other:

- Completely removed django-cachalot from the codebase (#110). You can safely
  remove the CACHALOT_ENABLED setting from your .env file

CHANGELOG

@@ -3,6 +3,27 @@ Changelog
 
 .. towncrier
 
+0.6.1 (unreleased)
+------------------
+
+Features:
+
+- Can now skip acoustid on file import with the --no-acoustid flag (#111)
+
+
+Bugfixes:
+
+- Added missing batch id in output during import (#112)
+- Added some feedback on the play button (#100)
+- Smarter pagination which takes a fixed size (#84)
+
+
+Other:
+
+- Completely removed django-cachalot from the codebase (#110). You can safely
+  remove the CACHALOT_ENABLED setting from your .env file
+
+
 0.6 (2018-03-04)
 ----------------
 

api/funkwhale_api/__init__.py

 # -*- coding: utf-8 -*-
-__version__ = '0.6'
+__version__ = '0.6.1'
 __version_info__ = tuple([int(num) if num.isdigit() else num for num in __version__.replace('-', '.', 1).split('.')])

changes/changelog.d/100.bugfix

-Added some feedback on the play button (#100)

changes/changelog.d/110.misc

-Completely removed django-cachalot from the codebase (#110). You can safely remove the CACHALOT_ENABLED setting from your .env file

changes/changelog.d/111.feature

-Can now skip acoustid on file import with the --no-acoustid flag (#111)

changes/changelog.d/112.bugfix

-Added missing batch id in output during import (#112)

changes/changelog.d/84.bugfix

-Smarter pagination which takes a fixed size (#84)