Skip to content
Snippets Groups Projects

Hotline master

Merged Patrick Barroca requested to merge hotline-master into master
  1. Mar 17, 2016
    • Patrick Barroca's avatar
      version 7.5.19 · 5dd16668
      Patrick Barroca authored
      Merge remote-tracking branch 'refs/remotes/origin/stable' into origin-hotline-master
      
      Conflicts:
      	VERSIONS
      	library/startup.php
      5dd16668
    • Patrick Barroca's avatar
      version 7.4.17 · 9d0eff58
      Patrick Barroca authored
      9d0eff58
    • Patrick Barroca's avatar
      Merge branch... · 72de0273
      Patrick Barroca authored
      Merge branch 'hotline#40463_probleme_fonctionnement_des_webservices_regression' into 'hotline-master'
      
      Hotline#40463 probleme fonctionnement des webservices regression
      
      See merge request !1575
      72de0273
  2. Mar 16, 2016
  3. Mar 15, 2016