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

Merge branch 'master' into origin-hotline#50082_mixed_records_links_in_loans_list 

# Conflicts:
#	application/modules/opac/controllers/AbonneController.php
#	tests/application/modules/opac/controllers/AbonneControllerPretsTest.php
#	tests/library/Class/WebService/SIGB/CdScriptTest.php
#	tests/library/Class/WebService/SIGB/NanookTest.php
parents e9ee9a77 20cad27b
Branches
Tags
6 merge requests!2080Sandbox detach zf from storm,!2061Master,!2009Master,!2008Hotline master,!2003Hotline#50082 mixed records links in loans list,!1917[WIP] Hotline#50082 mixed records links in loans list
Pipeline #275 failed with stage
in 51 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 253 additions and 109 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