Merge branch 'rel/2.6.0' into 'v2.6'

Rel/2.6.0 See merge request fsl/fslpy!162

Merge branch 'rel/2.6.0' into 'v2.6'
Rel/2.6.0 See merge request fsl/fslpy!162
996a52af · Paul McCarthy · cefc3e03 · 36a247d0 · 996a52af · 996a52af
Commit 996a52af authored Sep 09, 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.6.0 (Under development)
-------------------------
+2.6.0 (Tuesday 10th September 2019)
+-----------------------------------


 Added

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


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