3 Commits

Author	SHA1	Message	Date
Jaco Greeff	7bbd48a2bd	Merge branch 'master' into ui-2 ... # Conflicts: # js/package.json # js/src/api/local/ethkey/worker.js # js/src/modals/FirstRun/TnC/tnc.js # js/src/modals/FirstRun/Welcome/welcome.js # js/src/ui/Form/Input/input.js # js/src/ui/VaultCard/Accounts/accounts.spec.js # js/src/views/Accounts/accounts.js # js/src/views/Application/TabBar/tabBar.js # js/src/views/Settings/Views/defaults.js # js/src/views/Settings/Views/views.js # js/webpack/app.js # js/webpack/libraries.js	2017-06-13 11:02:38 +02:00
Afri	2ab21acf11	Update CHANGELOG for 1.6.7 (#5683)	2017-05-23 15:28:41 +02:00
Afri	77c8d588fa	Add CHANGELOG.md (#5513) ... * Add CHANGELOG.md * Add some more verbose CHANGELOG information for beta and stable releases * Add dates to releases	2017-05-02 12:08:48 +02:00