Skip to content
Snippets Groups Projects

Master

Merged Patrick Barroca requested to merge master into WIP
  1. Mar 22, 2018
  2. Mar 20, 2018
    • Patrick Barroca's avatar
      Merge branch... · 04a7834f
      Patrick Barroca authored
      Merge branch 'dev#71949_contractuel_pairing_minsoc_ne_pas_enregistrer_le_mot_de_passe_dans_bokeh' into 'master'
      
      Dev#71949 contractuel pairing minsoc ne pas enregistrer le mot de passe dans bokeh
      
      See merge request !2555
      04a7834f
    • Patrick Barroca's avatar
      Merge remote-tracking branch 'refs/remotes/origin/master' into... · a2022ee3
      Patrick Barroca authored
      Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#71949_contractuel_pairing_minsoc_ne_pas_enregistrer_le_mot_de_passe_dans_bokeh
      
      Conflicts:
      	library/Class/AdminVar.php
      a2022ee3
    • Patrick Barroca's avatar
      Merge branch... · cc0c889b
      Patrick Barroca authored
      Merge branch 'dev#62394_contractuel_afficher_les_raisons_des_actions_non_possibles_prolonger_reserver_koha' into 'master'
      
      Dev#62394 contractuel afficher les raisons des actions non possibles prolonger reserver koha
      
      See merge request !2554
      cc0c889b