Merge branch 'saas' into saas-dev

Conflicts:
	airtime_mvc/application/views/scripts/billing/upgrade.phtml
	airtime_mvc/public/css/billing.css
This commit is contained in:
Albert Santoni 2015-09-02 10:47:37 -04:00
commit a17001a90a
5 changed files with 14 additions and 258 deletions

View file

@ -64,19 +64,6 @@
color: #000;
}
.pricing-grid .august-promo div {
display: inline-block;
background-color: #ff611f;
padding: 3px 5px;
border-radius: 5px;
margin-left: -5px;
color: #ffffff;
}
.pricing-grid .august-promo span {
text-decoration: line-through;
}
.pricing-grid td, .pricing-grid th
{
border-bottom: 1px solid #5b5b5b;