Rob Harrington a96cdd5ee7 Merge branch 'master' into line_item_naming ...

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

2015-11-13 09:54:26 +11:00

..

cms_fixtures/example.com

Add base install of Comfortable Mexican Sofa

2012-10-11 10:50:36 +11:00

default/spree

Update states to match

2013-10-30 10:42:23 +11:00

migrate

Merge branch 'master' into line_item_naming

2015-11-13 09:54:26 +11:00

sanitize_data.rb

Add script to sanitize order and user data.

2013-02-10 16:54:39 +11:00

schema.rb

Merge branch 'master' into line_item_naming

2015-11-13 09:54:26 +11:00

seeds.rb

Remove landing page images

2014-07-17 14:26:46 +10:00

suburb_seeds.rb

fix suburb typo

2014-09-14 12:27:24 +10:00