antelle c2212ac4ad Merge branch 'master' into develop ... # Conflicts: # package.json # release-notes.md		2019-09-20 06:01:44 +02:00
..
app.js	fix #348: configurable system-wide shortcuts	2019-09-14 16:36:30 +02:00
icon.png	up deps	2017-01-28 23:13:39 +01:00
mac-menubar-icon@2x.png	optimized mac menubar icon image	2017-12-04 22:35:18 +01:00
main.js	year	2019-08-18 08:12:11 +02:00
package-lock.json	bump version	2019-09-19 23:06:10 +02:00
package.json	bump version	2019-09-19 23:06:10 +02:00