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

..

confirm_order_job_spec.rb

Add jobs for user, order and enterprise emails

2015-04-16 16:54:43 +10:00

confirm_signup_job_spec.rb

Add jobs for user, order and enterprise emails

2015-04-16 16:54:43 +10:00

finalize_account_invoices_spec.rb

Using rails time zone account invoice job specs

2015-10-28 16:51:18 +11:00

order_cycle_notification_job_spec.rb

Convention

2015-04-29 15:56:27 +10:00

update_account_invoices_spec.rb

Using rails time zone account invoice job specs

2015-10-28 16:51:18 +11:00

update_billable_periods_spec.rb

Using rails time zone account invoice job specs

2015-10-28 16:51:18 +11:00

welcome_enterprise_job_spec.rb

Add jobs for user, order and enterprise emails

2015-04-16 16:54:43 +10:00