Skip to content
Snippets Groups Projects
  • Patrick Barroca's avatar
    version 7.9.10 · 99ab16c6
    Patrick Barroca authored
    Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master
    
    # Conflicts:
    #	VERSIONS
    #	application/modules/admin/views/scripts/lieu/index.phtml
    #	cosmogramme/sql/patch/patch_320.php
    #	cosmogramme/sql/patch/patch_321.php
    #	library/startup.php
    #	tests/application/modules/opac/controllers/NoticeAjaxControllerItemsTest.php
    #	tests/db/UpgradeDBTest.php
    99ab16c6
VERSIONS 211.76 KiB