Rohan Mitchell bf61d12bfa Merge branch 'simple-order-cycles' ...

Conflicts:
	app/views/admin/order_cycles/_row.html.haml

2014-10-23 12:11:34 +11:00

..

assets

Merge branch 'simple-order-cycles'

2014-10-23 12:11:34 +11:00

controllers

Merge branch 'master' into bugfix

2014-10-21 08:51:23 +11:00

helpers

Merge branch 'master' into simple-order-cycles

2014-10-23 09:36:03 +11:00

mailers

Only send one enterprise creation confirmation email

2014-10-17 12:29:51 +11:00

models

Merge branch 'master' into bugfix

2014-10-21 08:51:23 +11:00

overrides

Admin can change the format that Spree::Images are stored/served in

2014-10-16 12:41:11 +11:00

presenters

Simplify exchange products/variants JSON output format, bind angular to this

2013-01-10 10:59:53 +11:00

serializers

Make state abbreviations upper case

2014-10-17 12:29:51 +11:00

views

Merge branch 'simple-order-cycles'

2014-10-23 12:11:34 +11:00