Skip to content
Snippets Groups Projects

Hotline master

Merged Patrick Barroca requested to merge hotline-master into master
  1. Mar 17, 2015
    • Patrick Barroca's avatar
      version 7.1.18 · 16d488b7
      Patrick Barroca authored
      Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master
      
      # Conflicts:
      #	VERSIONS
      #	application/modules/opac/controllers/RechercheController.php
      #	library/Class/Import/Typo3.php
      #	library/startup.php
      #	tests/application/modules/admin/controllers/CmsControllerTest.php
      #	tests/library/Class/ArticleTest.php
      16d488b7
    • Patrick Barroca's avatar
      version 7.0.11 · 27e10901
      Patrick Barroca authored
      27e10901
  2. Mar 16, 2015
  3. Mar 13, 2015
  4. Mar 12, 2015
  5. Mar 11, 2015
  6. Mar 10, 2015