merge upstream

2026-01-24 00:35:20 +00:00 · 2021-06-01 16:00:13 +08:00
parent 6f40d78353
commit ad7bbd6442
38 changed files with 496 additions and 45 deletions
--- a/setup.yml
+++ b/setup.yml
@@ -54,5 +54,5 @@
    - matrix-coturn
    - matrix-aux
    - matrix-postgres-backup
-    - matrix-common-after
-
+    - matrix-prometheus-postgres-exporter
+    - matrix-common-after