Skip to content
Snippets Groups Projects
Commit b970a21c authored by Patrick Barroca's avatar Patrick Barroca :grin:
Browse files

version 7.11.14

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

# Conflicts:
#	VERSIONS
#	library/startup.php
#	public/opac/java/mycarousel_horizontal/jMyCarousel.pack.js
#	public/opac/java/mycarousel_vertical/jMyCarousel.pack.js
parents 190203f1 0a79c14d
Branches
Tags 7.11.14
1 merge request!2464Master
Pipeline #3209 passed with stage
in 28 minutes and 4 seconds
Showing
with 690 additions and 181 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