From 5f2e0907b74e7e4858ce88adc8bcfd1a6a79e76e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Mon, 23 Nov 2015 03:10:46 +0100
Subject: [PATCH] freeze 0.5.5.0
---
Changelog.md | 4 ----
config/defaults.yml | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/Changelog.md b/Changelog.md
index fb7e4d72e7..8cf3cb95fe 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,7 +1,5 @@
# 0.5.5.0
-## Refactor
-
## Bug fixes
* Redirect to sign in page when a background request fails with 401 [#6496](https://github.com/diaspora/diaspora/pull/6496)
* Correctly skip setting sidekiq logfile on Heroku [#6500](https://github.com/diaspora/diaspora/pull/6500)
@@ -10,8 +8,6 @@
* Prevent participations being created for invalid interactions [#6552](https://github.com/diaspora/diaspora/pull/6552)
* Improve federation for reshare related interactions [#6481](https://github.com/diaspora/diaspora/pull/6481)
-## Features
-
# 0.5.4.0
## Refactor
diff --git a/config/defaults.yml b/config/defaults.yml
index b16e6521a7..76ab9b5df6 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -4,7 +4,7 @@
defaults:
version:
- number: "0.5.4.99" # Do not touch unless doing a release, do not backport the version number that's in master
+ number: "0.5.5.0" # Do not touch unless doing a release, do not backport the version number that's in master
heroku: false
environment:
url: "http://localhost:3000/"
--
GitLab