There was a problem fetching the latest pipeline status.
Merge remote-tracking branch 'origin' into...
Merge remote-tracking branch 'origin' into origin-dev#59584_bonus_ameliorer_le_tri_dans_les_articles_pagines_pour_tous_les_prendre_en_compte Conflicts: application/modules/admin/controllers/CmsController.php library/ZendAfi/Controller/Action/Helper/ArticleListViewMode.php tests/library/ZendAfi/Controller/Action/Helper/ArticleListViewModeTest.php
Showing
- VERSIONS 7 additions, 0 deletionsVERSIONS
- application/modules/admin/controllers/CmsController.php 5 additions, 5 deletionsapplication/modules/admin/controllers/CmsController.php
- library/Class/User/DoubleFinder.php 1 addition, 1 deletionlibrary/Class/User/DoubleFinder.php
- library/ZendAfi/Controller/Action/Helper/ArticleListViewMode.php 7 additions, 6 deletions.../ZendAfi/Controller/Action/Helper/ArticleListViewMode.php
- library/startup.php 1 addition, 1 deletionlibrary/startup.php
- tests/application/modules/admin/controllers/CmsControllerListModeTest.php 4 additions, 4 deletions...n/modules/admin/controllers/CmsControllerListModeTest.php
- tests/library/Class/UserDoubleFinderTest.php 1 addition, 1 deletiontests/library/Class/UserDoubleFinderTest.php
- tests/library/ZendAfi/Controller/Action/Helper/ArticleListViewModeTest.php 1 addition, 1 deletion...dAfi/Controller/Action/Helper/ArticleListViewModeTest.php
Please register or sign in to comment