Serraniel 5edf65b578 Merge branch 'develop' into feature/#147-automatic-time-conversion ... # Conflicts: # package-lock.json # package.json		2020-12-28 18:43:51 +01:00
..
browserApi	#32 Fixed issues remarked by scrutinizer-ci	2020-11-08 13:18:41 +01:00
configuration	Merge branch 'develop' into feature/#147-automatic-time-conversion	2020-12-28 18:43:51 +01:00
enhancements	Merge branch 'develop' into feature/#147-automatic-time-conversion	2020-12-28 18:43:51 +01:00
utils	#147 First attempts with spacetime and time conversion	2020-12-28 16:09:53 +01:00
app.js	Merge branch 'develop' into feature/#147-automatic-time-conversion	2020-12-28 18:43:51 +01:00
settings.js	#32 Added version information and changelog hyperlink into settings	2020-11-08 13:11:52 +01:00