Merge remote-tracking branch 'refs/remotes/origin/hotline-master'
Conflicts: library/Class/User/ILSSubscription.php tests/library/Class/UsersTest.php
Showing
- VERSIONS_HOTLINE/43155 1 addition, 0 deletionsVERSIONS_HOTLINE/43155
- VERSIONS_HOTLINE/50880 1 addition, 0 deletionsVERSIONS_HOTLINE/50880
- VERSIONS_HOTLINE/51096 1 addition, 0 deletionsVERSIONS_HOTLINE/51096
- cosmogramme/php/util_paniers.php 0 additions, 159 deletionscosmogramme/php/util_paniers.php
- library/Class/Batch.php 2 additions, 2 deletionslibrary/Class/Batch.php
- library/Class/Batch/Jamendo.php 5 additions, 0 deletionslibrary/Class/Batch/Jamendo.php
- library/Class/Batch/RessourceNumerique.php 5 additions, 2 deletionslibrary/Class/Batch/RessourceNumerique.php
- library/Class/Cosmogramme/Integration/PhaseBatchs.php 14 additions, 7 deletionslibrary/Class/Cosmogramme/Integration/PhaseBatchs.php
- library/Class/Cosmogramme/Integration/PhasePanier.php 3 additions, 1 deletionlibrary/Class/Cosmogramme/Integration/PhasePanier.php
- library/Class/User/ILSSubscription.php 4 additions, 5 deletionslibrary/Class/User/ILSSubscription.php
- tests/library/Class/Cosmogramme/Integration/PhaseBatchsTest.php 27 additions, 7 deletions...library/Class/Cosmogramme/Integration/PhaseBatchsTest.php
- tests/library/Class/Cosmogramme/Integration/PhaseItemFacetsTest.php 1 addition, 1 deletion...ary/Class/Cosmogramme/Integration/PhaseItemFacetsTest.php
- tests/library/Class/Cosmogramme/Integration/PhasePanierTest.php 42 additions, 6 deletions...library/Class/Cosmogramme/Integration/PhasePanierTest.php
- tests/library/Class/Cosmogramme/Integration/PhaseTestCase.php 3 additions, 2 deletions...s/library/Class/Cosmogramme/Integration/PhaseTestCase.php
- tests/library/Class/UsersTest.php 12 additions, 6 deletionstests/library/Class/UsersTest.php
- tests/scenarios/Jamendo/JamendoTest.php 18 additions, 0 deletionstests/scenarios/Jamendo/JamendoTest.php
Please register or sign in to comment