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

Merge branch 'origin-stable' into origin-master

Conflicts:
	VERSIONS
	library/startup.php
	tests/library/Class/MoteurRechercheTest.php
parents a18e7053 127440de
Branches
Tags
1 merge request!1797Master
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