Jaco Greeff d852e6b063 Merge branch 'master' into ui-2 ... # Conflicts: # js/src/views/Signer/components/SignRequest/signRequest.js		2017-10-17 09:55:13 +02:00
..
_default	Merge branch 'master' into ui-2	2017-10-17 09:55:13 +02:00
de
en	Ui 2 move to packages/* (#6113)	2017-07-21 15:46:53 +02:00
nl	Merge branch 'master' into ui-2	2017-10-09 10:23:21 +02:00
zh	Merge branch 'master' into ui-2	2017-10-17 09:55:13 +02:00
zh-Hant-TW	Merge branch 'master' into ui-2	2017-10-17 09:55:13 +02:00
constants.js
index.js
languages.js
languages.spec.js
store.js	Merge master	2017-09-07 13:32:45 +02:00
store.spec.js