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/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt
+++ b/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt
@ -29,7 +29,7 @@ enum class FeatureFlags(
    Polls(
        key = "feature.polls",
        title = "Polls",
-        description = "Render poll events in the timeline",
+        description = "Create poll and render poll events in the timeline",
        defaultValue = false,
    ),
    NotificationSettings(