2.1.0

jupyter · Oct 2, 2020 · d437855 · d437855
1 parent ba33f4b
commit d437855
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/docs/source/changelog.md b/docs/source/changelog.md
@@ -2,6 +2,15 @@
 
 ## 2.0
 
+###  2.1.0 - 2020-10
+
+- Dropped Python 3.5 support.
+- Optimize comparison of large stream outputs.
+- Fixed an error when merging a file that were concurrently added in two branches with git.
+- Fixed a config bug where ignore configs written in a file was not taken into account.
+- Fixed compatibility with JupyterLab 2.2
+- Various other fixes and adjustments.
+
 ###  2.0.0 - 2020-03
 
 - Dropped Python 2 support, and Python 3.4 support.

diff --git a/nbdime/_version.py b/nbdime/_version.py
@@ -1,2 +1,2 @@
-version_info = (2, 0, 1, 'dev')
+version_info = (2, 1, 0)
 __version__ = ".".join(map(str, version_info))
diff --git a/packages/webapp/package.json b/packages/webapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nbdime-webapp",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "private": true,
   "license": "BSD-3-Clause",
   "main": "static/nbdime.js",