Merge pull request #4643 from mailcow/staging

2022-06a | IMAPSync Hardening + Docker-Compose v2 now needed
Merge branch 'feature/imapsync' into staging
2022-06-23 15:04:46 +02:00 · 2022-06-23 11:26:07 +02:00 · 2022-06-23 11:25:58 +02:00 · 2022-06-19 22:23:35 +02:00
1 changed files with 2 additions and 1 deletions
--- a/data/web/lang/lang.es.json
+++ b/data/web/lang/lang.es.json
@@ -19,7 +19,8 @@
        "syncjobs": "Trabajos de sincronización",
        "tls_policy": "Póliza de TLS",
        "unlimited_quota": "Cuota ilimitada para buzones",
-        "app_passwds": "Gestionar las contraseñas de aplicaciones"
+        "app_passwds": "Gestionar las contraseñas de aplicaciones",
        "domain_desc": "Cambiar descripción del dominio"
    },
    "add": {
        "activate_filter_warn": "Todos los demás filtros se desactivarán cuando este filtro se active.",
Author	SHA1	Message	Date
Niklas Meyer	3d538d4f14	Merge pull request #4643 from mailcow/staging 2022-06a \| IMAPSync Hardening + Docker-Compose v2 now needed	2022-06-23 15:04:46 +02:00
Niklas Meyer	7969e7116d	Merge branch 'feature/imapsync' into staging	2022-06-23 11:26:07 +02:00
Niklas Meyer	4f58f2caee	Merge branch 'feature/update-composev2' into staging	2022-06-23 11:25:58 +02:00
milkmaker	af9c3a8565	[Web] Updated lang.es.json [CI SKIP] (#4638 ) Co-authored-by: Daniel Castellanos <decacis@gmail.com> Co-authored-by: Daniel Castellanos <decacis@gmail.com>	2022-06-19 22:23:35 +02:00