Skip to content
Commit 799fbe9e authored by Maria Poveda's avatar Maria Poveda
Browse files

Merge branch 'integrate' into 'develop-v2.1.1' 

Import SAREF and don't use deprecated terms

Closes #9, #11, #12, #16, #15, #6, #5, and #10

See merge request !6
parents 624bee0f 86c3b5e8
Pipeline #6742 passed with warnings with stages
in 36 seconds
Expand all Hide whitespace changes
Inline Side-by-side
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