964d67f878
Conflicts: modules/basket/controllers/admin_configure.php modules/basket/controllers/admin_postage_bands.php modules/basket/controllers/admin_product_lines.php modules/basket/controllers/basket.php modules/basket/helpers/basket.php modules/basket/helpers/basket_event.php modules/basket/helpers/basket_installer.php modules/basket/helpers/postage_band.php modules/basket/helpers/product.php modules/basket/views/add_to_basket.html.php modules/basket/views/admin_configure.html.php modules/basket/views/admin_postage_bands.html.php modules/basket/views/admin_product_lines.html.php modules/basket/views/basket.html.php modules/basket/views/checkout.html.php modules/basket/views/confirm_order.html.php modules/basket/views/order_complete.html.php modules/basket/views/view_basket.html.php modules/favourites/controllers/favourites.php modules/gwtorganise/controllers/json_album.php modules/user_homes/helpers/user_homes_event.php |
||
---|---|---|
.. | ||
.externalToolBuilders | ||
.settings | ||
controllers | ||
helpers | ||
src | ||
views | ||
war | ||
.classpath | ||
.project | ||
build.xml | ||
module.info |