antelle aa5a9fc6d2 Merge branch 'master' into usb ... # Conflicts: # app/scripts/app.js # package.json # release-notes.md		2020-05-04 19:46:07 +02:00
..
app.js	Merge branch 'develop' into usb	2020-04-18 11:03:06 +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	app startup time profiling	2020-03-29 10:59:40 +02:00
package-lock.json	bump version	2020-05-04 19:12:08 +02:00
package.json	bump version	2020-05-04 19:12:08 +02:00