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,5 +1,5 @@
<ion-view id="onboard-welcome" class="onboarding">
<ion-content>
<ion-content ng-controller="welcomeController" ng-init="createProfile()">
<img src="../img/onboarding-welcome-shopping24.png" id="shopping-24" />
<div class="text-center">
<div class="row">
@ -16,6 +16,5 @@
<div class="row">
<button class="button button-block restore col col-75" translate>Restore</button>
</div>
</div>
</ion-content>
</ion-view>