Albert Santoni 479153df17 Merge branch 'saas' into saas-dev ... Conflicts: airtime_mvc/public/css/billing.css		2015-09-21 18:01:56 -04:00
..
client.phtml	SAAS-1021: Billing page restyle	2015-08-26 09:11:25 -04:00
index.phtml	whmcs client form	2014-06-12 17:54:20 -04:00
invoice.phtml	Created an invoice view	2014-06-19 16:55:01 -04:00
invoices.phtml	SAAS-1021: Billing page restyle	2015-08-26 09:11:25 -04:00
upgrade.phtml	Merge branch 'saas' into saas-dev	2015-09-21 18:01:56 -04:00