Merge branch 'master' into develop

andped10 · andped10 · commit fd45b65005b0 · 2024-11-21T13:27:56.000+01:00
diff --git a/docs/src/tutorials/tutorials.rst b/docs/src/tutorials/tutorials.rst
@@ -11,4 +11,5 @@ The tutorials associated with using :py:mod:`easyreflectometry` are collected he
    sample/material_solvated
    sample/monolayer
    sample/multi_contrast
-   sample/resolution_functions
+   sample/resolution_functions
+   magnetism
diff --git a/src/easyreflectometry/__version__.py b/src/easyreflectometry/__version__.py
@@ -1 +1 @@
-__version__ = '1.1.1'
+__version__ = '1.2.0'
