David Cook 6a303d7db9 Merge branch 'enterprise-reports' ...

Conflicts:
	app/models/spree/ability_decorator.rb

2013-08-30 16:27:13 +10:00

..

admin

Merge branch 'enterprise-reports'

2013-08-30 16:27:13 +10:00

chili

Payment Method must belong to a Distributor

2013-08-21 15:14:01 +10:00

consumer

Bumped up the sleep time in the spec.

2013-08-21 16:26:08 +10:00