self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

Desktop: Fixed broken menu bar

Browse Source
This commit is contained in:
Laurent Cozic 2019-09-16 22:54:40 +01:00
parent 3ea97ad9ff
commit 224a4d786b
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ElectronClient/app/app.js
View File

@ -535,7 +535,7 @@ class Application extends BaseApplication {
},
});
const toolsItems = toolsItemsFirst.push({
const toolsItems = toolsItemsFirst.concat([{
label: _('Options'),
visible: !shim.isMac(),
accelerator: 'CommandOrControl+,',
@ -545,7 +545,7 @@ class Application extends BaseApplication {
routeName: 'Config',
});
},
});
}]);
function _checkForUpdates(ctx) {
bridge().checkForUpdates(false, bridge().window(), ctx.checkForUpdateLoggerPath(), { includePreReleases: Setting.value('autoUpdate.includePreReleases') });

1
ReactNativeClient/start_emulator.bat
View File

@ -1 +0,0 @@
c:\Users\Laurent\AppData\Local\Android\sdk\tools\emulator.exe -avd Nexus_5X_API_23_Google_API_