Skip to content
Snippets Groups Projects
Commit 02cf75df authored by Patrick Barroca's avatar Patrick Barroca
Browse files

version 7.5.25

Merge remote-tracking branch 'refs/remotes/origin/stable' into origin-hotline-master

Conflicts:
	VERSIONS
	library/Class/Catalogue.php
	library/startup.php
	tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php
parents 40f096e5 ef028de4
Branches
Tags
2 merge requests!1659Master,!1645Hotline master
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