Philipp Dormann 736ddf4f03 Merge remote-tracking branch 'upstream/master' ... # Conflicts: # README.md # dockerfile # package-lock.json # package.json # server/notification.js # server/server.js # src/assets/vars.scss # src/components/NotificationDialog.vue # src/layouts/Layout.vue # src/mixins/socket.js # src/pages/Dashboard.vue # src/pages/EditMonitor.vue		2021-07-24 19:10:55 +02:00
..
ISSUE_TEMPLATE	Update --please-go-to--discussion--tab-if-you-want-to-ask-or-share-something.md	2021-07-21 16:29:15 +08:00
workflows	add temporary workflow for explicit docker release on ghcr.io	2021-07-14 23:56:05 +02:00