Change 'ready on' to 'ready for'
Adding shipping method description to checkout
Add shipping method description to confirmation email, cleanup
Change text of OC delivery instructions placeholder
Change text of OC collection details
Remove shipping category from admin edit shipping methods
Patching Rabl helper
Merge branch 'laura_and_will'
Merge branch 'sm-desc' into working
Merge branch 'laura_and_will'
Adding config changes to app.rb, fixing mixing producers links
Merge branch 'laura_and_will'
Patching up some regressions with the tabs
Loading enterprises per-view again
Reverting the main_app changes
Further tidy-up for order confirmation email
Merge branch 'master' into working
Changing promo image explanation text
Temporary fix to get staging working
Merge branch 'master' into working