pulled in latest commits from yesterday, merged and handled conflicts

This commit is contained in:
Jamal Jackson 2016-09-01 08:59:37 -04:00
commit f15d597b25
123 changed files with 1686 additions and 1291 deletions

View file

@ -1,6 +1,6 @@
<ion-view id="terms-of-use">
<ion-nav-bar class="bar-light">
<ion-nav-title>Terms of Use</ion-nav-title>
<ion-nav-bar class="bar-ligt">
<ion-nav-title>{{'Terms of Use' | translate}}</ion-nav-title>
<ion-nav-buttons side="primary">
<button class="button no-border" href ui-sref="onboarding.disclaimer">
<i class="icon ion-arrow-left-c"></i>