summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2014-10-02 15:41:05 +0200
committerMarin Jankovski <maxlazio@gmail.com>2014-10-02 15:41:05 +0200
commitcc2d7771db4aea62e7597b433900d052b7ed944d (patch)
treebd074087b641887758a7fac706c0c3fc76c104e7 /CHANGELOG
parent798977c87b61f2f7ae000cee3d1c5fc232ec0754 (diff)
parent093c2c6a01fe2cfaff72b2624b65896fed339ab5 (diff)
downloadgitlab-ce-cc2d7771db4aea62e7597b433900d052b7ed944d.tar.gz
Merge branch 'feature/zen_for_gfm' of github.com:Razer6/gitlabhq into Razer6-feature/zen_for_gfm
Conflicts: CHANGELOG
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 6448c14abd0..b9020d825cb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@ v 7.4.0
- API: Add support for forking a project via the API (Bernhard Kaindl)
- API: filter project issues by milestone (Julien Bianchi)
- Fail harder in the backup script
+ - Zen mode for wiki and milestones (Robert Schilling)
v 7.3.2
- Fix creating new file via web editor