antelle dd68aa342a Merge branch 'develop' into usb ... # Conflicts: # app/scripts/const/default-app-settings.js # app/scripts/views/open-view.js		2020-04-23 20:26:52 +02:00
..
index.js	Update cordova launcher, remove unnecessary code	2019-12-16 22:37:42 +01:00
launcher-cordova.js	using OAuth authorization code grant for all storage providers	2020-04-17 19:42:35 +02:00
launcher-electron.js	Merge branch 'develop' into usb	2020-04-23 20:26:52 +02:00