Rafael Schouten 08cd273be3 Merge branch 'migrate_ent_types' into bugfix ...

Conflicts:
	app/models/spree/ability_decorator.rb

2014-10-18 07:37:41 +11:00

..

images

Merging master into my branch to make it up to date

2014-09-12 14:48:19 +10:00

javascripts

Merge branch 'migrate_ent_types' into bugfix

2014-10-18 07:37:41 +11:00

stylesheets

Merge branch 'master' into migrate_ent_types

2014-10-07 10:52:26 +11:00