Merge branch 'rel/3.6.0' into 'v3.6'

DOC: version See merge request fsl/fslpy!296

Merge branch 'rel/3.6.0' into 'v3.6'
DOC: version See merge request fsl/fslpy!296
800fd87e · Paul McCarthy · af88e018 · 38ede89a · 800fd87e
Commit 800fd87e authored Apr 19, 2021 by Paul McCarthy 🚵
--- a/fsl/version.py
+++ b/fsl/version.py
@@ -47,7 +47,7 @@ import            re
 import            string


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