Serraniel c0cd4ff873 Merge branch 'develop' into feature/#161-autoscroll-w2g ... # Conflicts: # src/javascript/app.ts # src/javascript/configuration/configuration.ts		2021-02-13 20:04:51 +01:00
..
settings.html	Merge branch 'develop' into feature/#161-autoscroll-w2g	2021-02-13 20:04:51 +01:00