From 4fad5041cf4d6792a8e13f8e2ee6b07eb6b44fae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Mon, 4 May 2015 00:47:36 +0200
Subject: [PATCH] update changelog and version for 0.6.0.0
---
Changelog.md | 10 +++++++++-
config/defaults.yml | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Changelog.md b/Changelog.md
index 55a5dd4e5c..14d08a121d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,12 @@
+# 0.6.0.0
+
+## Refactor
+
+## Bug fixes
+* Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852)
+
+## Features
+
# 0.5.1.0
## Refactor
@@ -10,7 +19,6 @@
* Disable auto follow back on aspect deletion [#5846](https://github.com/diaspora/diaspora/pull/5846)
* Fix only sharing flag for contacts that are receiving [#5848](https://github.com/diaspora/diaspora/pull/5848)
* Return 406 when requesting a JSON representation of people/:guid/contacts [#5849](https://github.com/diaspora/diaspora/pull/5849)
-* Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852)
* Hide manage services link in the publisher on certain pages [#5854](https://github.com/diaspora/diaspora/pull/5854)
* Fix notification mails for limited posts [#5877](https://github.com/diaspora/diaspora/pull/5877)
* Fix medium and small avatar URLs when using Camo [#5883](https://github.com/diaspora/diaspora/pull/5883)
diff --git a/config/defaults.yml b/config/defaults.yml
index 10ba80504c..2b78836262 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -4,7 +4,7 @@
defaults:
version:
- number: "0.5.0.99" # Do not touch unless doing a release, do not backport the version number that's in master but keep develop to always say "head"
+ number: "0.5.99.0" # Do not touch unless doing a release, do not backport the version number that's in master but keep develop to always say "head"
heroku: false
environment:
url: "http://localhost:3000/"
--
GitLab