From 19c7aaa5f7751a122b2108cc7c2a2311398b574d Mon Sep 17 00:00:00 2001
From: Vojtech Juranek <vjuranek@redhat.com>
Date: Fri, 16 Jan 2015 23:10:01 +0100
Subject: [PATCH] Add changelog record for PR #1460

---
 changelog.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/changelog.html b/changelog.html
index c6b6287c3c..f9df51e898 100644
--- a/changelog.html
+++ b/changelog.html
@@ -94,6 +94,10 @@ Upcoming changes</a>
   <li class=rfe>
     Improve error reporting when channel closed during build.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-26411">issue 26411</a>)
+  <li class=bug>
+    Fixed CodeMirror issue with height and re-enabled syntax highlighting in shell build step.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-25455">issue 25455</a>,
+     <a href="https://issues.jenkins-ci.org/browse/JENKINS-23151">issue 23151</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 
-- 
GitLab