Skip to content
Snippets Groups Projects
Commit 5a58b129 authored by efalcy's avatar efalcy
Browse files

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

Conflicts:
	VERSIONS
	library/Class/Indexation/PseudoNotice/UnimarcVisitor.php
	library/startup.php
parents 967fbd38 f716a6cd
Branches
Tags
2 merge requests!2480Master,!2479Hotline master
Showing
with 429 additions and 101 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