Skip to content
Find file Blame History Permalink
  • Patrick Barroca's avatar
    Merge remote-tracking branch 'refs/remotes/afi/master' into... · 41fd60a4
    Patrick Barroca authored 
    Merge remote-tracking branch 'refs/remotes/afi/master' into dev#61350_entrepot_oai_gallica_europeana

# Conflicts:
#	application/modules/admin/views/scripts/album/edit-images.phtml
#	library/ZendAfi/View/Helper/TagUploadMultiple.php
#	tests/library/ZendAfi/View/Helper/TagUploadMultipleTest.php
    41fd60a4