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

version 7.11.1

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

# Conflicts:
#	VERSIONS
#	library/startup.php
#	public/opac/js/subModal.js
parents 85c0d5a9 3c5d23d1
Branches
Tags
No related merge requests found
Pipeline #2557 passed with stage
in 23 minutes and 3 seconds
Showing
with 153 additions and 75 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