Merge branch 'mnt/pre-release' into 'master'

Mnt/pre release See merge request fsl/fslpy!117

Merge branch 'mnt/pre-release' into 'master'
Mnt/pre release See merge request fsl/fslpy!117
856ee2eb · Paul McCarthy · 2198a420 · 3e5aacee · 856ee2eb · 856ee2eb
Commit 856ee2eb authored Apr 12, 2019 by Paul McCarthy 🚵
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,8 +2,8 @@ This document contains the ``fslpy`` release history in reverse chronological
 order.


-2.1.0 (Under development)
-------------------------
+2.1.0 (Friday April 12th 2019)
+------------------------------


 Added

--- a/fsl/version.py
+++ b/fsl/version.py
@@ -47,7 +47,7 @@ import            re
 import            string


-__version__ = '2.1.0.dev0'
+__version__ = '2.2.0.dev0'
 """Current version number, as a string. """