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

Merge remote-tracking branch 'refs/remotes/afi/dev/15524' into afi-master

Conflicts:
	VERSIONS
parents ee0a5cfd 37fd7852
Branches
Tags
1 merge request!393Master
Showing
with 546 additions and 379 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