Skip to content
This repository has been archived by the owner on Sep 5, 2020. It is now read-only.

Develop into master #1516

Merged
merged 14 commits into from
Dec 14, 2016
Merged

Develop into master #1516

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
79fc96c
updated electron to 1.4.10
frozeman Nov 29, 2016
ffaa85b
updated yarn.lock
frozeman Nov 29, 2016
1f3452a
Merge branch 'develop' of github.com:ethereum/mist into develop
frozeman Dec 6, 2016
87c1c39
merged upstream
frozeman Dec 6, 2016
038cb0b
Merge branch 'develop' of github.com:ethereum/mist into develop
frozeman Dec 6, 2016
ea32f2c
Merge branch 'develop' of github.com:ethereum/mist into develop
frozeman Dec 12, 2016
bb0a58f
Merge branch 'develop' of github.com:ethereum/mist into develop
frozeman Dec 13, 2016
ac58bf7
Merge branch 'develop' of github.com:ethereum/mist into develop
frozeman Dec 13, 2016
28f09be
Fix webview ids (#1513)
frozeman Dec 14, 2016
0cfd404
update solc to 0.4.5 (#1515)
luclu Dec 14, 2016
5cb26b4
[ESLint] remove annoying rules, update main.js (#1514)
luclu Dec 14, 2016
8a4c31c
Merge branch 'develop' of github.com:ethereum/mist into develop
frozeman Dec 14, 2016
287598b
Merge branch 'master' into develop
frozeman Dec 14, 2016
601d5fb
removed Q.cancel()
frozeman Dec 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'develop' of github.com:ethereum/mist into develop
  • Loading branch information
@frozeman
frozeman committed Dec 12, 2016
commit ea32f2ce3a33ba1006641fbb5f4c4c0411cfc994

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.