Merge branch 'master' into v0.3.0 · mwouts/jupytext@9780779 · GitHub

Commit

Merge branch 'master' into v0.3.0

Browse files

# Conflicts:
#	HISTORY.rst
#	README.md
#	nbrmd/__init__.py
#	nbrmd/cm.py
#	nbrmd/combine.py
#	setup.py
#	tests/test_jupyter_hook.py

Loading branch information

mwouts committed Jul 17, 2018

2 parents 908dd6b + de57bfc commit 9780779