Merge branch 'develop' of https://github.com/vector-im/element-x-android into yostyle/notifications_global_settings

2023-08-30 15:02:59 +01:00 · 2023-08-30 15:02:59 +01:00 · 5e2ec8b504
commit 5e2ec8b504
parent 69905afbd9 b8d6db2f14
315 changed files with 3724 additions and 1216 deletions
--- a/tools/localazy/config.json
+++ b/tools/localazy/config.json
@ -118,7 +118,14 @@
    {
      "name": ":features:ftue:impl",
      "includeRegex": [
-        "screen_welcome_.*"
+        "screen_welcome_.*",
+        "screen_migration_.*"
+      ]
+    },
+    {
+      "name": ":features:poll:impl",
+      "includeRegex": [
+        "screen_create_poll_.*"
      ]
    }
  ]