diff options
| author | James Lopez <james@jameslopez.es> | 2016-05-12 18:40:50 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-05-12 18:40:50 +0200 |
| commit | 491a312724076f5113766b5fb55f38fee316dd38 (patch) | |
| tree | 90e3395a8b5237f9638e15495bb24a3c11a068ef | |
| parent | 6a70c060fa08a42c8339e7a3433f13ca7115b0c5 (diff) | |
| download | gitlab-ce-491a312724076f5113766b5fb55f38fee316dd38.tar.gz | |
fix merge conflict
| -rw-r--r-- | CHANGELOG | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index 986f465327a..5412e4c19bb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -47,14 +47,14 @@ v 8.8.0 (unreleased) - Bump ace-rails-ap gem version from 2.0.1 to 4.0.2 which upgrades Ace Editor from 1.1.2 to 1.2.3 - Total method execution timings are no longer tracked +v 8.7.6 + - Fix external imports not finding the import data + v 8.7.5 - Fix relative links in wiki pages. !4050 - Fix always showing build notification message when switching between merge requests !4086 - Fix an issue when filtering merge requests with more than one label. !3886 -v 8.7.6 - - Fix external imports not finding the import data - v 8.7.4 - Links for Redmine issue references are generated correctly again !4048 (Benedikt Huss) - Fix setting trusted proxies !3970 |