Rafael Schouten f3fc70ebf0 Merge branch 'master' into raf_bugfix ...

Conflicts:
	app/assets/stylesheets/admin/openfoodnetwork.css.scss

2014-10-04 12:51:55 +10:00

..

admin

hide configuration on

2014-10-03 11:46:00 +10:00

checkout

Update delivery page of checkout, change shipping to delivery

2013-09-19 13:40:49 +10:00

layouts

configure textAngular on enterprise edit page

2014-09-30 18:20:45 +10:00

products

Adding an override to suppress the products display unless we actually have an order_cycle in play

2013-11-08 16:04:31 +11:00

shared

Reworking the shipping confirmation

2014-03-19 16:09:45 +11:00