Commit e24cacb5 authored by Remi Perenon's avatar Remi Perenon

Merge branch 'develop' into 'hotfix-get_type_of_opened_data_file_macos'

# Conflicts:
#   CHANGELOG
#   MDANSE/__pkginfo__.py
parents 7a4102ec 217cd333
Pipeline #4031 canceled with stages
in 7 seconds
version 1.2.0
--------------
version 1.1.2
--------------
* ADDED issue #15 An automatic mode for data loading is added to compel with the fact that data filter does not appear in data loading popup on macOS
......
......@@ -25,7 +25,7 @@ __repo__ = "https://code.ill.fr/scientific-software/mdanse/"
__license__ = "GPL 3"
__version__ = "1.1.2"
__version__ = "1.2.0"
__date__ = "20-06-2018"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment