fix merge conflict

This commit is contained in:
James Lopez 2016-05-12 18:40:50 +02:00
parent 6a70c060fa
commit 491a312724
1 changed files with 3 additions and 3 deletions

View File

@ -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