This repository has been archived on 2021-04-26. You can view files and clone it, but cannot push or open issues or pull requests.

Ben Smith 964d67f878 Merge branch 'master' of git@github.com:gallery/gallery3-contrib.git ... 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		2010-09-03 19:37:38 +12:00
..
admin_gwtorganise.php	Update the copyright to 2010.	2010-03-03 10:16:08 -08:00
admin_upload_configure.php	Change json::reply calls to use "html" instead of "form" and not JSON	2010-07-31 21:32:59 -07:00
json_album.php	Merge branch 'master' of git@github.com:gallery/gallery3-contrib.git	2010-09-03 19:37:38 +12:00