Merge branch 'ref/design' of https://github.com/jamal-jackson/bitpay-wallet into feature/get_started_tour

# Conflicts: # public/views/onboarding/welcome.html
2016-09-01 10:12:35 -04:00 · 2016-09-01 10:12:35 -04:00 · 1caf875ad1
commit 1caf875ad1
parent e935ea64e8 546891d69c
46 changed files with 526 additions and 527 deletions
--- a/src/js/routes.js
+++ b/src/js/routes.js
@ -270,7 +270,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
      })
      .state('tabs.import', {
        url: '/import/:fromOnboarding',
-        abstract: true,
+//        abstract: true,
        views: {
          'tab-home': {
            templateUrl: 'views/import.html'