Skip to content
Snippets Groups Projects

Master

Merged Patrick Barroca requested to merge master into WIP
  1. Jun 02, 2015
    • Patrick Barroca's avatar
      Merge branch 'hotline-master' into 'master' · d37b69b0
      Patrick Barroca authored
      Hotline master
      
      See merge request !902
      d37b69b0
    • Patrick Barroca's avatar
      version 7.1.35 · 794bda72
      Patrick Barroca authored
      Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master
      
      # Conflicts:
      #	VERSIONS
      #	cosmogramme/php/_init.php
      #	cosmogramme/sql/patch/patch_237.php
      #	library/Class/Systeme/PergameService.php
      #	library/Class/Users.php
      #	library/startup.php
      #	tests/library/Class/ModelTestCase.php
      #	tests/library/Class/Systeme/PergameServiceTest.php
      794bda72
    • Patrick Barroca's avatar
      version 7.0.21 · 850e4182
      Patrick Barroca authored
      850e4182
  2. Jun 01, 2015
  3. May 29, 2015
  4. May 28, 2015
  5. May 27, 2015
  6. May 26, 2015
  7. May 22, 2015