From 39b86ed486be7e9bc4b906988b54111aa0e5d971 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Sun, 5 May 2019 04:21:37 +0200 Subject: [PATCH 1/2] Remvoe unused Changelog headline [ci skip] --- Changelog.md | 1 - 1 file changed, 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index e22291293..2dbd4123d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,7 +3,6 @@ ## Refactor * Enable paranoid mode for devise [#8003](https://github.com/diaspora/diaspora/pull/8003) * Refactor likes cucumber test [#8002](https://github.com/diaspora/diaspora/pull/8002) -## Bug fixes ## Features * Add a manifest.json file as a first step to make diaspora\* a Progressive Web App [#7998](https://github.com/diaspora/diaspora/pull/7998) From 3704be8becff1e33d9fb4915b17d2586883f8d8b Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Sun, 5 May 2019 04:22:10 +0200 Subject: [PATCH 2/2] Prepare 0.7.12.0 cycle [ci skip] --- Changelog.md | 8 ++++++++ config/defaults.yml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 2dbd4123d..37091fb49 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,11 @@ +# 0.7.12.0 + +## Refactor + +## Bug fixes + +## Features + # 0.7.11.0 ## Refactor diff --git a/config/defaults.yml b/config/defaults.yml index c04665f69..d866ccec6 100644 --- a/config/defaults.yml +++ b/config/defaults.yml @@ -4,7 +4,7 @@ defaults: version: - number: "0.7.10.99" # Do not touch unless doing a release, do not backport the version number that's in master + number: "0.7.11.99" # Do not touch unless doing a release, do not backport the version number that's in master heroku: false environment: url: "http://localhost:3000/"