Skip to content
  • Ghislain Loas's avatar
    Merge branch... · 8078afa2
    Ghislain Loas authored
    Merge branch 'hotline#122399_gpsea_p4_page_notice_exemplaires_modification_informations_de_la_carte' into origin-hotline
    
    # Conflicts:
    #	library/templates/Chili/Library/Settings.php
    8078afa2