Merge pull request #3239 from matiu/feat/trezor

Trezor Support
This commit is contained in:
Gustavo Maximiliano Cortez 2015-10-02 19:29:03 -03:00
commit 006377d38f
12 changed files with 779 additions and 96 deletions

View file

@ -37,7 +37,8 @@ module.exports = function(grunt) {
'src/js/routes.js',
'src/js/services/*.js',
'src/js/models/*.js',
'src/js/controllers/*.js'
'src/js/controllers/*.js',
'src/js/trezor.js'
],
tasks: ['concat:js']
}
@ -77,7 +78,8 @@ module.exports = function(grunt) {
'src/js/controllers/*.js',
'src/js/translations.js',
'src/js/version.js',
'src/js/init.js'
'src/js/init.js',
'src/js/trezor.js'
],
dest: 'public/js/copay.js'
},