Skip to content
Snippets Groups Projects
Commit aa3b9b44 authored by Laurent's avatar Laurent
Browse files

Merge branch 'master' into origin-dev-togetherjs

Conflicts:
	library/startup.php
parents e708c3fd efaed120
Branches
Tags 7.1.17
3 merge requests!258Dev/13872 Orphee Allow Hold Available Items,!24Hotline Dev Batch Index Numeric Ressources,!19Dev Togetherjs
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