Took some updates from another fork and merged with this - #1

Open

Wohlstand wants to merge 23 commits into

vinhal:masterfrom

Wohlstand:master

Commits on Jan 20, 2019

Commits on Feb 9, 2019

Bump electron from 4.0.1 to 4.0.4
dependabot-support
committed
58b2721
[Security] Bump cryptiles from 3.1.2 to 3.1.4
dependabot-support
committed
058bd12
[Security] Bump extend from 3.0.1 to 3.0.2
dependabot-support
committed
645d426
[Security] Bump hoek from 4.2.0 to 4.2.1
dependabot-support
committed
0a79db3
[Security] Bump lodash from 4.17.4 to 4.17.11
dependabot-support
committed
f0b0be4
[Security] Bump sshpk from 1.13.1 to 1.16.1
dependabot-support
committed
eadb2f2
[Security] Bump stringstream from 0.0.5 to 0.0.6
dependabot-support
committed
e8f2f88
Merge pull request #7 from pjclutterbuck/dependabot/npm_and_yarn/stringstream-0.0.6
Paul Clutterbuck
authored
9462499
Merge pull request #6 from pjclutterbuck/dependabot/npm_and_yarn/sshpk-1.16.1
Paul Clutterbuck
authored
ba1a2a4
Merge pull request #5 from pjclutterbuck/dependabot/npm_and_yarn/lodash-4.17.11
Paul Clutterbuck
authored
1752ff4
Merge pull request #4 from pjclutterbuck/dependabot/npm_and_yarn/hoek-4.2.1
Paul Clutterbuck
authored
3f482f0
Merge pull request #3 from pjclutterbuck/dependabot/npm_and_yarn/extend-3.0.2
Paul Clutterbuck
authored
5f6da5b
Merge pull request #2 from pjclutterbuck/dependabot/npm_and_yarn/cryptiles-3.1.4
Paul Clutterbuck
authored
dc71b78
Merge pull request #1 from pjclutterbuck/dependabot/npm_and_yarn/electron-4.0.4
Paul Clutterbuck
authored
5412c8a
Merge pull request #1 from pjclutterbuck/master
marco-calautti
authored
7af1261
removed fixed electron version.
marco-calautti
committed
f7d5282

Commits on May 15, 2019

Merge branch 'master' of git@github.com:marco-calautti/Whatsapp-Desktop.git
Wohlstand
committed
40b8d2a
Note about Windows 7
Wohlstand
committed
2d9a3db