From 2eee95c6a5170cd8a9deba77db59174d2b7a0351 Mon Sep 17 00:00:00 2001
From: Josh Barnes <joshuacookebarnes@gmail.com>
Date: Fri, 6 Oct 2017 03:29:22 +0100
Subject: [PATCH] [doc] update changelog for #1118 [skip CI]

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b60132b..06b1ed7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,10 @@ which makes it much easier to fill in each release's changelog :)
 
 New features and bugfixes:
 
+- `code_prettify`, `autopep8` & `2to3`
+  [#1118](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1118)
+  [@jcb91](https://github.com/jcb91)
+  Merge upstream changes, using textareas for json parameter editing
 - `toc2`
   * [#1084](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1084)
     [@jfbercher](https://github.com/jfbercher)