Rohan Mitchell 2f83cecc23 Merge branch 'add-capture-order-shortcut-deface' ...

Conflicts:
	spec/support/request/authentication_workflow.rb

2013-07-23 16:55:33 +10:00

..

admin

Merge branch 'add-capture-order-shortcut-deface'

2013-07-23 16:55:33 +10:00

chili

Reset ActionMailer::Base.deliveries at start of test - http://stackoverflow.com/questions/5843284/clearing-out-activemailerbase-deliveries-after-rspec-test

2013-07-22 16:58:53 +10:00

consumer

Merge branch 'master' into order-cycle-selection

2013-07-23 14:42:57 +10:00