Merge branch 'develop' into 'hotfix-gui_issues_plotter_and_user_definition_viewer'

# Conflicts: # CHANGELOG # MDANSE/__pkginfo__.py

Merge branch 'develop' into 'hotfix-gui_issues_plotter_and_user_definition_viewer'
# Conflicts: # CHANGELOG # MDANSE/__pkginfo__.py
f5277e5e · Remi Perenon · f4780fb9 · 5d93406d · f5277e5e · f5277e5e
Commit f5277e5e authored Jun 28, 2018 by Remi Perenon
--- a/CHANGELOG
+++ b/CHANGELOG
+version 1.2.0
+--------------
+
 version 1.1.3
 --------------
 * FIXED issue #17 The plotter crashed when user was clicking on "plot in new window"

--- a/MDANSE/__pkginfo__.py
+++ b/MDANSE/__pkginfo__.py
@@ -25,7 +25,7 @@ __repo__             = "https://code.ill.fr/scientific-software/mdanse/"

 __license__          = "GPL 3"

-__version__ = "1.1.3"
+__version__ = "1.2.0"

 __date__ = "27-06-2018"