Merge branch 'develop' into 'hotfix-debian_package_name'

9bb8e862 · Remi Perenon · 6688dbc1 · 08286251 · 9bb8e862 · 9bb8e862
Commit 9bb8e862 authored Jun 14, 2018 by Remi Perenon
--- a/CHANGELOG
+++ b/CHANGELOG
+version 1.2.0
+--------------
+
 version 1.1.1
 --------------
 * FIXED issue #14 Package name was not valid for debian package in 1.1.0 version

--- 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.1"
+__version__ = "1.2.0"

 __date__ = "14-06-2018"