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
nl
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
store.spec.js