Moe 065bfe5b87 Merge branch 'master' into 'dev' ... # Conflicts: # .gitlab-ci.yml # Docker/install_nodejs.sh # Dockerfile # web/assets/js/bs5.timeline.js		2024-04-01 22:58:15 +00:00
..
assets	Merge branch 'master' into 'dev'	2024-04-01 22:58:15 +00:00
libs	move js files to assets vendor/js	2022-08-13 20:36:24 -07:00
pages	Merge branch 'shermdog-dev-patch-95742' into 'dev'	2024-03-11 20:18:53 +00:00
templates	Allow Mass Config Changes by API (monitorStates) and more	2018-11-10 19:59:02 -08:00