antelle d66b33fd19 Merge branch 'master' into develop ... # Conflicts: # release-notes.md		2019-11-03 12:52:37 +01:00
..
index.js	imports	2019-09-15 14:16:32 +02:00
launcher-cordova.js	less underscore	2019-09-17 23:44:17 +02:00
launcher-electron.js	Merge branch 'master' into develop	2019-11-03 12:52:37 +01:00