diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-12-11 10:33:03 +0100 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-12-11 10:33:03 +0100 |
commit | cd97dba2a9a26e83818f7e111bc0b0185a7ced8a (patch) | |
tree | 23195397edc1d24b527f793b4275087320c14cd5 /CHANGELOG | |
parent | 73942b15e775d34ea3563545942978a726c5f28e (diff) | |
parent | a2798e8d06641be61e8a44682984c2d4b123e70f (diff) | |
download | gitlab-ce-cd97dba2a9a26e83818f7e111bc0b0185a7ced8a.tar.gz |
Merge branch 'zj/gitlab-ce-copying-file-seen-as-licence'
Diffstat (limited to 'CHANGELOG')
-rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index e38c8b363e7..585e6c42043 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -42,6 +42,7 @@ v 8.3.0 (unreleased) - Fix sidebar tooltips when collapsed - Prevent possible XSS attack with award-emoji - Upgraded Sidekiq to 4.x + - Accept COPYING,COPYING.lesser, and licence as license file (Zeger-Jan van de Weg) v 8.2.3 - Fix application settings cache not expiring after changes (Stan Hu) |