Merge branch 'origin-hotline#15488_rename_panier' into origin-hotline_6.49
Conflicts: VERSIONS
Showing
- VERSIONS 3 additions, 0 deletionsVERSIONS
- application/modules/admin/views/scripts/accueil/_options_catalogue_panier.phtml 1 addition, 1 deletion...min/views/scripts/accueil/_options_catalogue_panier.phtml
- application/modules/admin/views/scripts/menus/catalogue.phtml 1 addition, 1 deletion...ication/modules/admin/views/scripts/menus/catalogue.phtml
- application/modules/opac/controllers/PanierController.php 1 addition, 1 deletionapplication/modules/opac/controllers/PanierController.php
- application/modules/opac/views/scripts/panier/creer-panier-ajax.phtml 1 addition, 1 deletion...modules/opac/views/scripts/panier/creer-panier-ajax.phtml
- application/modules/opac/views/scripts/panier/edit.phtml 1 addition, 1 deletionapplication/modules/opac/views/scripts/panier/edit.phtml
- library/ZendAfi/View/Helper/Abonne/Paniers.php 3 additions, 3 deletionslibrary/ZendAfi/View/Helper/Abonne/Paniers.php
- library/ZendAfi/View/Helper/Notice/LienReserver.php 6 additions, 6 deletionslibrary/ZendAfi/View/Helper/Notice/LienReserver.php
- library/storm 1 addition, 1 deletionlibrary/storm
- library/translation/en.mo 0 additions, 0 deletionslibrary/translation/en.mo
- library/translation/en.po 8211 additions, 6953 deletionslibrary/translation/en.po
- library/translation/fr.mo 0 additions, 0 deletionslibrary/translation/fr.mo
- library/translation/fr.po 977 additions, 29 deletionslibrary/translation/fr.po
- library/translation/fr.pot 983 additions, 36 deletionslibrary/translation/fr.pot
- library/translation/ro.mo 0 additions, 0 deletionslibrary/translation/ro.mo
- library/translation/ro.po 1040 additions, 30 deletionslibrary/translation/ro.po
- tests/application/modules/opac/controllers/PanierControllerTest.php 1 addition, 1 deletion...ication/modules/opac/controllers/PanierControllerTest.php
Please register or sign in to comment