Merge tag '0.2.5' into develop

0.2.5 (2017-12-15)
------------------

Features:

- Import: can now specify search template when querying import sources (#45)
- Login form: now redirect to previous page after login (#2)
- 404: a decent 404 template, at least (#48)

Bugfixes:

- Player: better handling of errors when fetching the audio file (#46)
- Csrf: default CSRF_TRUSTED_ORIGINS to ALLOWED_HOSTS to avoid Csrf issues on admin (#49)

Tech:

- Django 2 compatibility, lot of packages upgrades (#47)

CHANGELOG

@@ -2,7 +2,12 @@ Changelog
 =========
 
 
-0.2.5 (unreleased)
+0.2.6 (Unreleased)
+------------------
+
+
+
+0.2.5 (2017-12-15)
 ------------------
 
 Features:

api/funkwhale_api/__init__.py

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