Merge branch 'origin-stable' into origin-master
Conflicts: VERSIONS library/startup.php tests/library/Class/MoteurRechercheTest.php
Showing
- VERSIONS_HOTLINE/46007 1 addition, 0 deletionsVERSIONS_HOTLINE/46007
- library/Class/CriteresRecherche.php 1 addition, 1 deletionlibrary/Class/CriteresRecherche.php
- library/Class/MoteurRecherche.php 2 additions, 3 deletionslibrary/Class/MoteurRecherche.php
- tests/library/Class/MoteurRechercheTest.php 46 additions, 82 deletionstests/library/Class/MoteurRechercheTest.php
Please register or sign in to comment