From 7c99cbb56146400223c1b013d653ddd644b00576 Mon Sep 17 00:00:00 2001
From: Marc Wouts <marc.wouts@gmail.com>
Date: Fri, 13 Jul 2018 15:38:46 +0200
Subject: [PATCH] New version 0.2.6 #12

---
 HISTORY.rst | 13 +++++++++++++
 setup.py    |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index bc99020bd..b0df52f8f 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -6,6 +6,19 @@ Release History
 dev
 +++
 
+0.2.6 (2018-07-13)
++++++++++++++++++++
+
+**Improvements**
+
+- Introduced `nbrmd_sourceonly_format` metadata
+- Inputs are loaded from `.Rmd` file when a matching `.ipynb` file is
+opened.
+
+**BugFixes**
+
+- Trusted notebooks remain trusted (#12)
+
 0.2.5 (2018-07-11)
 +++++++++++++++++++
 
diff --git a/setup.py b/setup.py
index 06c5e00e1..6240fd874 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     name='nbrmd',
-    version='0.2.5',
+    version='0.2.6',
     author='Marc Wouts',
     author_email='marc.wouts@gmail.com',
     description='Jupyter from/to R markdown notebooks',