Manually fix automatic CHANGELOG merge

e361dc3a · Jacob Vosmaer · 05b518aa · e361dc3a
Commit e361dc3a authored Jul 29, 2015 by Jacob Vosmaer
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

CHANGELOG CHANGELOG +0 -4

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,10 +19,6 @@ v 7.14.0 (unreleased)
  - Add fetch command to the MR page.
  - Allow custom backup archive permissions

-v 7.13.0 (unreleased)
-  - Add fetch command to the MR page
-  - Fix bug causing Bitbucket importer to crash when OAuth application had been removed.
-
 v 7.13.1
  - Fix: Label modifications are not reflected in existing notes and in the issue list
  - Fix: Label not shown in the Issue list, although it's set through web interface