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

version 7.9.32 

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

# Conflicts:
#	VERSIONS
#	application/modules/admin/views/scripts/album/import-ead.phtml
#	library/Class/PanierNotice.php
#	library/Class/Systeme/Report.php
#	library/startup.php
#	tests/application/modules/admin/controllers/AlbumControllerTest.php
#	tests/db/UpgradeDBTest.php
parents f671ffdb 7979067e
Branches
Tags 7.9.32
3 merge requests!2334Master,!2254Master,!2253Hotline master
Pipeline #2107 passed with stage
in 20 minutes and 4 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 135 additions and 91 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