antelle 4fad58b1e9 Merge branch 'develop' into usb ... # Conflicts: # app/scripts/models/app-settings-model.js # app/templates/open.hbs		2020-04-15 18:23:52 +02:00
..
app.js	usb 101	2020-04-15 16:50:01 +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-04-15 17:29:56 +02:00
package.json	bump version	2020-04-15 17:29:56 +02:00