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

Merge branch... 

Merge branch 'dev#64573_templates_pour_l_interface_publique_libraire_bootstrap_v55' into origin-master

Conflicts:
	library/ZendAfi/View/Helper/Filters/Element.php
parents eff96ddf b861d1dd
Branches
Tags
3 merge requests!3297WIP: Master,!3220Master,!3216WIP: Koha pagination le retour
Pipeline #8092 failed with stage
in 31 minutes and 39 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 217 additions and 14 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