From 3b6d474d69bebbf66f898dd99d7121919f228caf Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Wed, 28 Feb 2018 19:29:31 +0100
Subject: [PATCH] Changelog and version bump

---
 CHANGELOG                      | 13 +++++++++++++
 api/funkwhale_api/__init__.py  |  2 +-
 changes/changelog.d/91.bugfix  |  1 -
 changes/changelog.d/95.bugfix  |  1 -
 changes/changelog.d/98.feature |  0
 5 files changed, 14 insertions(+), 3 deletions(-)
 delete mode 100644 changes/changelog.d/91.bugfix
 delete mode 100644 changes/changelog.d/95.bugfix
 delete mode 100644 changes/changelog.d/98.feature

diff --git a/CHANGELOG b/CHANGELOG
index f2705739..6e849442 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,19 @@ Changelog
 
 .. towncrier
 
+0.5.4 (2018-02-28)
+------------------
+
+Features:
+
+- Now stop running radio when clearing queue (#98)
+
+Bugfixes:
+
+- Fixed queue skipping tracks (#91)
+- Now loop properly on queue when we only have one track (#95)
+
+
 0.5.3 (2018-02-27)
 ------------------
 
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index 03e43459..c1f45ffb 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
-__version__ = '0.5.3'
+__version__ = '0.5.4'
 __version_info__ = tuple([int(num) if num.isdigit() else num for num in __version__.replace('-', '.', 1).split('.')])
diff --git a/changes/changelog.d/91.bugfix b/changes/changelog.d/91.bugfix
deleted file mode 100644
index 4fde544c..00000000
--- a/changes/changelog.d/91.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed queue skipping tracks (#91)
diff --git a/changes/changelog.d/95.bugfix b/changes/changelog.d/95.bugfix
deleted file mode 100644
index fea5c947..00000000
--- a/changes/changelog.d/95.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Now loop properly on queue when we only have one track (#95)
diff --git a/changes/changelog.d/98.feature b/changes/changelog.d/98.feature
deleted file mode 100644
index e69de29b..00000000
-- 
GitLab