You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Louis Lam 90761cf831 Merge remote-tracking branch 'origin/master' into karelkryda_master ... # Conflicts: # server/database.js # server/model/monitor.js # server/routers/api-router.js # server/server.js # src/components/HeartbeatBar.vue # src/components/MonitorList.vue # src/icon.js # src/layouts/Layout.vue # src/mixins/datetime.js # src/mixins/socket.js # src/router.js # src/util.js		2 years ago
..
api-router.js	Merge remote-tracking branch 'origin/master' into karelkryda_master	2 years ago
status-page-router.js	Add standalone manifest.json for each status page. Close #1668	2 years ago