diff options
author | Stan Hu <stanhu@gmail.com> | 2015-06-30 08:32:56 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2015-06-30 08:32:56 +0300 |
commit | e489b07d2bc70654728b2c6be903cd8adf090176 (patch) | |
tree | 9bde481ad3bdcc48b7b571c85d0d9657514b2bde /CHANGELOG | |
parent | 1161c93661f4630185289844965fb701df902642 (diff) | |
parent | e5661001d667313d6ce56886d10c2a7ae313fe0f (diff) |
Merge branch 'fix-c-prototype-highlighting' into 'master'
Bump rugments to 1.0.0beta8 to fix C prototype function highlighting
Closes #1890
See merge request !902
Diffstat (limited to 'CHANGELOG')
-rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 4ee5a950d99..22207eabc59 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.13.0 (unreleased) - Fix order of issues imported form GitHub (Hiroyuki Sato) + - Bump rugments to 1.0.0beta8 to fix C prototype function highlighting (Jonathon Reinhart) - Fix Merge Request webhook to properly fire "merge" action when accepted from the web UI - Add `two_factor_enabled` field to admin user API (Stan Hu) - Fix invalid timestamps in RSS feeds (Rowan Wookey) |