Merge branch 'master' into v0.14.0-pre

This commit is contained in:
Lea Anthony
2019-05-12 15:15:11 +10:00
4 changed files with 111 additions and 6 deletions

3
.vscode/launch.json vendored
View File

@@ -12,7 +12,8 @@
"program": "${workspaceFolder}/cmd/wails/main.go",
"env": {},
"args": [
"setup"
"update",
"-pre"
]
}
]