From 5ac9d261c1c94a03348ba549d0295b1193b562f4 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sat, 16 Dec 2017 16:15:33 +0100
Subject: [PATCH] Version bump and changelog

---
 CHANGELOG                     | 7 ++++++-
 api/funkwhale_api/__init__.py | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 0888c77e5..446146c29 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,7 +2,12 @@ Changelog
 =========
 
 
-0.2.5 (unreleased)
+0.2.6 (Unreleased)
+------------------
+
+
+
+0.2.5 (2017-12-15)
 ------------------
 
 Features:
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index 92ed1ff33..28e4b3203 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,3 +1,3 @@
 # -*- 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('.')])
-- 
GitLab