From 89fec1f2cc26caf77af03b1139b47d149069ef0b Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sat, 16 Dec 2017 16:37:45 +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 446146c2..aed490ea 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,10 +2,15 @@ Changelog
 =========
 
 
-0.2.6 (Unreleased)
+0.2.7 (Unreleased)
 ------------------
 
 
+0.2.6 (2017-12-15)
+------------------
+
+- Fixed broken Dockerfile
+
 
 0.2.5 (2017-12-15)
 ------------------
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index 28e4b320..f1a7b86a 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
-__version__ = '0.2.5'
+__version__ = '0.2.6'
 __version_info__ = tuple([int(num) if num.isdigit() else num for num in __version__.replace('-', '.', 1).split('.')])
-- 
GitLab