Merge branch 'master' into develop

2 files changed, 28 insertions, 0 deletions

diff --git a/.github/stale.yml b/.github/stale.yml
new file mode 100644
index 000000000..59a443d96
--- /dev/null
+++ b/.github/stale.yml
@@ -0,0 +1,25 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 365 # 1 year
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: -1 # Close the issue almost immediately. See: https://github.com/probot/stale/issues/131
+
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - blocker
+  - security
+  
+# Label to use when marking an issue as stale
+staleLabel: "[Status] Stale"
+
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+  
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index bdaf203c5..76b0f28d5 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -589,6 +589,9 @@ export default class FranzMenu {
         {
           label: intl.formatMessage(menuItems.quit),
           role: 'quit',
+          click: () => {
+            app.quit();
+          },
         },
       ],
     });