Merge branch 'develop' of https://github.com/NicolasConstant/sengis into develop

This commit is contained in:
Nicolas Constant 2020-05-24 16:40:09 -04:00
commit b0c16b3fa8
No known key found for this signature in database
GPG Key ID: 1E9F677FB01A5688
2 changed files with 9 additions and 5 deletions

View File

@ -38,11 +38,15 @@ function createWindow() {
{ type: "separator" },
{ role: "reload" },
{ role: "forcereload" },
{ type: 'separator' },
{ role: 'togglefullscreen' },
{ type: "separator" },
{ role: "resetzoom" },
{ role: "zoomin", accelerator: "CommandOrControl+=" },
{ role: "zoomout" },
{ type: "separator" },
{ role: "togglefullscreen" },
{ type: "separator" },
{ role: "close" },
{ role: 'quit' }
{ role: "quit" }
]
},
{
@ -191,4 +195,4 @@ app.on("activate", () => {
if (win === null) {
createWindow();
}
});
});

View File

@ -5,7 +5,7 @@
"main": "main-electron.js",
"description": "A multi-account desktop client for Mastodon and Pleroma",
"author": {
"name": "Nicolas Constant",
"name": "Nicolas Constant",
"email": "github@nicolas-constant.com"
},
"repository": {