Skip to content
Snippets Groups Projects
Commit 6f978ddf authored by Marco Folco's avatar Marco Folco
Browse files

Merge branch '12.0-stage' into 'minor_changes' 

# Conflicts:
#   models/health_insurance.py
parents 6c4a4ac5 92f7bc7a
No related branches found
No related tags found
1 merge request!21[MOD] sequence [MOD] py
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
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