Release 1.0.4

jupyter · Dec 18, 2018 · b9f4a0f · b9f4a0f
1 parent c24fc22
commit b9f4a0f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/docs/source/changelog.md b/docs/source/changelog.md
@@ -2,6 +2,11 @@
 
 ## 1.0
 
+###  1.0.4 - 2018-12
+
+- Fix git diffing failure with older versions of git. Now, an older version of git will simply prevent integration with git filters.
+- Allow for two-way merge by making the base notebook argument to `nbmerge` optional. It will now default to an empty notebook.
+
 ###  1.0.3 - 2018-10
 
 - Web: Fix issues with hiding unchanged cells. Make hiding unchanged cells configurable and on by default.

diff --git a/nbdime/_version.py b/nbdime/_version.py
@@ -1,2 +1,2 @@
-version_info = (1, 0, 4, 'dev')
+version_info = (1, 0, 4)
 __version__ = ".".join(map(str, version_info))