Maikel Linke 2053fbecda Merge branch 'i18n-replace-strings-in-js' into i18n ...

Conflicts:
	.travis.yml
	app/views/spree/order_mailer/confirm_email_for_customer.html.haml
	config/locales/en.yml

2015-10-21 14:09:43 +11:00

..

assets

new rails 3.1.4 app

2012-03-27 10:10:26 +11:00

open_food_network

Reorder methods

2015-10-15 12:00:40 +11:00

seed_data

New landing page - initial layout and functionality

2013-08-05 17:04:56 +10:00

spree

Perform variant override scoping on product/variant by external class. Centralise this so we can load everything in one go.

2015-06-18 13:11:11 +10:00

tasks

place I18n init at right place in karma task

2015-10-09 11:40:12 +11:00

templates/erb/scaffold

Add default simple_form configuration, locales, scaffold

2012-06-19 10:29:26 +10:00