Skip to content
Snippets Groups Projects
  1. Feb 04, 2021
    • Sebastien ANDRE's avatar
      Merge remote-tracking branch... · d9527ce8
      Sebastien ANDRE authored
      Merge remote-tracking branch 'refs/remotes/origin/dev#79898_bonuscontractuel_dilicom_prise_en_compte_de_la_drm_lcp_mercredi_1410'
      
      # Conflicts:
      #	cosmogramme/sql/patch/patch_397.php
      #	library/Class/AdminVar.php
      #	library/templates/Intonation/View/RenderAjax.php
      #	tests/db/UpgradeDBTest.php
      #	tests/scenarios/PnbDilicom/PnbDilicomTest.php
      #	tests/scenarios/Templates/TemplatesRecordsTest.php
      d9527ce8
  2. Feb 03, 2021
    • Patrick Barroca's avatar
      Merge remote-tracking branch... · b19f012e
      Patrick Barroca authored
      Merge remote-tracking branch 'refs/remotes/origin/dev#118579_contractuel_minsoc_definition_de_domaines_pouvoir_definir_l_operateur_etou_entre_un_critere_et_les_autres_pour_l_onglet_autorites_etape_2'
      
      # Conflicts:
      #	cosmogramme/sql/patch/patch_396.php
      #	library/ZendAfi/Form/Configuration/Domain.php
      #	tests/application/modules/admin/controllers/CatalogueControllerTest.php
      #	tests/db/UpgradeDBTest.php
      b19f012e
  3. Feb 01, 2021
  4. Jan 29, 2021
  5. Jan 28, 2021
  6. Jan 27, 2021
  7. Jan 26, 2021