Files
openfoodnetwork/app/views/spree/order_mailer
Rafael Schouten ff4f8f63af Merge branch 'master' into raf_bugfix
Conflicts:
	app/views/spree/order_mailer/confirm_email.text.haml
2014-10-02 19:06:30 +10:00
..