Skip to content

Changes to master back into development #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
andped10 wants to merge 5 commits into from
Closed

Changes to master back into development #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
81542a7
Merge pull request #178 from EasyScience/develop
andped10 Sep 10, 2024
a850308
Update tutorials.rst
andped10 Sep 10, 2024
07d7086
Merge pull request #182 from EasyScience/develop
andped10 Sep 19, 2024
07625a1
Merge pull request #203 from EasyScience/develop
andped10 Nov 21, 2024
edada37
Update __version__.py to 1.2.0
andped10 Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion docs/src/tutorials/tutorials.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion src/easyreflectometry/__version__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '1.1.1'
__version__ = '1.2.0'
Loading