Skip to content
Snippets Groups Projects
Commit 267c52db authored by Ghislain Loas's avatar Ghislain Loas
Browse files

Merge branch 'dev_15640_customfields_for_trainings'

Conflicts:
	VERSIONS
parents 1655c713 77186e4f
Branches
Tags
Showing
with 734 additions and 484 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