Skip to content
Snippets Groups Projects

Hotline master

Merged Patrick Barroca requested to merge hotline-master into master
  1. Feb 25, 2016
    • Patrick Barroca's avatar
      version 7.5.13 · 66ff83e9
      Patrick Barroca authored
      Merge remote-tracking branch 'refs/remotes/origin/stable' into origin-hotline-master
      
      Conflicts:
      	VERSIONS
      	library/startup.php
      66ff83e9
    • Patrick Barroca's avatar
      version 7.4.13 · 50880f9d
      Patrick Barroca authored
      50880f9d
    • Patrick Barroca's avatar
      Merge branch... · b143712d
      Patrick Barroca authored
      Merge branch 'hotline#38236_pb_dans_le_selection_de_bibliotheques_pour_la_recherche_de_la_page_catalogue' into 'stable'
      
      Hotline#38236 pb dans le selection de bibliotheques pour la recherche de la page catalogue
      
      See merge request !1522
      b143712d
  2. Feb 24, 2016
  3. Feb 23, 2016