Rohan Mitchell d908701b59 Merge branch 'master' into folklabs-producer-emails ...

Conflicts:
	Gemfile

2015-06-11 17:02:34 +10:00

..

customers_controller_spec.rb

add spec_helper to customers_controller_spec

2015-06-05 14:25:45 +10:00

enterprises_controller_spec.rb

Remove redundant spec line, test that sells is not changed

2015-04-17 15:42:42 +10:00

order_cycles_controller_spec.rb

Remove puts from specs, fix failing controller spec

2015-04-29 14:46:20 +10:00