Fix Conflicts:

.gitignore index.html js/controllers/backup.js js/controllers/sidebar.js
2014-07-28 12:28:07 -03:00 · 2014-07-28 12:28:07 -03:00 · 85aa5842f1
commit 85aa5842f1
parent 31b0a2da60 5fbbec3dc8
74 changed files with 5237 additions and 200 deletions
--- a/js/controllers/sidebar.js
+++ b/js/controllers/sidebar.js
@ -18,7 +18,7 @@ angular.module('copayApp.controllers').controller('SidebarController',
      'icon': 'fi-arrow-right',
      'link': 'send'
    }, {
-      'title': 'More...',
+      'title': 'More',
      'icon': 'fi-download',
      'link': 'backup'
    }];