Skip to content
Snippets Groups Projects
Commit 89265a3f authored by Patrick Barroca's avatar Patrick Barroca :grin:
Browse files

Merge branch 'afi-dev#13230-CVS-tracks' into afi-master 

Conflicts:
	VERSIONS
parents ec35af06 f9c53ca4
Branches
Tags
3 merge requests!258Dev/13872 Orphee Allow Hold Available Items,!180Master,!137Master
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