Skip to content

Commit 74a07fe

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents e7f7608 + 94309dc commit 74a07fe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+902
-841
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ app/node_modules/
66
.DS_Store
77
.awcache
88
*.sketch
9+
.idea/

app/.npmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
runtime = electron
22
disturl = https://atom.io/download/electron
3-
target = 1.6.7
3+
target = 1.6.11
44
arch = x64

0 commit comments

Comments
 (0)