Maikel Linke 0b4a43d77a Merge remote-tracking branch 'origin/master' into i18n-replace-strings-in-views ...

Conflicts:
	app/views/shared/menu/_cart.html.haml
	app/views/spree/order_mailer/confirm_email_for_shop.html.haml

2015-09-16 16:32:16 +10:00

..

assets

Merge remote-tracking branch 'origin/master' into uk-variable-weights-improvements

2015-09-10 16:05:28 +10:00

controllers

Add first cut of LettuceShare report

2015-08-07 10:37:59 +10:00

helpers

Admin can upload logo for ContentConfig

2015-07-17 16:06:49 +10:00

jobs

Add jobs for user, order and enterprise emails

2015-04-16 16:54:43 +10:00

mailers

Add rails-i18n gem.

2014-12-03 09:39:35 +11:00

models

Handling nil in final_weight_volume calculation

2015-09-16 10:12:59 +10:00

overrides

Restoring all changes of the last combined branch

2015-09-10 15:03:13 +10:00

presenters

Admin can set enterprise fee's tax category

2015-03-05 10:44:25 +11:00

serializers/api

Variable weights improvements additions

2015-08-04 20:13:28 +01:00

views

Merge remote-tracking branch 'origin/master' into i18n-replace-strings-in-views

2015-09-16 16:32:16 +10:00