Skip to content
Snippets Groups Projects

Merge branch…

Merged Ghislain Loas requested to merge cherry-pick-7c7c205a into master
  1. Aug 28, 2018
    • Ghislain Loas's avatar
      Merge branch... · 2dd9feec
      Ghislain Loas authored
      Merge branch 'dev#65688_2355bonus_contractuel_koha_prise_en_compte_du_statut_en_transfert_desormais_renvoye_par_ilsdi' into 'WIP'
      
      Dev#65688 2355bonus contractuel koha prise en compte du statut en transfert desormais renvoye par ilsdi
      
      See merge request !2760
      
      (cherry picked from commit 7c7c205a)
      
      9ec95c0b dev #65688 : add fixture koha transfert
      2ac8483b dev #65688 : display transfer on koha disponibility
      28d80e8c dev #65688 : fix tests
      972fc5a6 Merge branch 'fix_fnac_tests' into 'hotline'
      98104cfb dev #65688 : format
      05065c92 Merge branch 'cherry-pick-0af87c95' into…
      d7eb8bc8 dev #65688 : replace 'en transfert de .. a ..' by 'en transfert' and fix translations
      5554af0a Merge branch…
      d15ae828 dev #65688 : delete file features
      72ce5c4e dev #65688 : fix tests
      99e55390 dev #65688 : fix tests
      1fd5b22e Merge branch 'master' into…
      566e3cf0 Merge remote-tracking branch 'remotes/origin/master' into…
      c89a1616 dev #65688 remove xdebug_break + fix indent
      2dd9feec