• Patrick Barroca's avatar
    version 7.9.32 · 46cb63bc
    Patrick Barroca authored
    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
    46cb63bc