ariskotsomitopoulos 40de685f1a Merge branch 'develop' into feature/aris/threads_post_release_ui_improvements ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt

2022-05-12 14:41:38 +03:00

..

sampledata

Implement poll in timeline ui.

2021-12-03 11:39:41 +03:00

signature

…

src

Merge branch 'develop' into feature/aris/threads_post_release_ui_improvements

2022-05-12 14:41:38 +03:00

.gitignore

…

build.gradle

Merge pull request #5987 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-gradle-plugin-1.6.21

2022-05-10 18:23:51 +02:00

lint.xml

Remove unused resources

2022-03-09 14:55:40 +01:00

proguard-rules.pro

Fix Authenticated Jitsi not working in release #3841

2021-08-16 15:43:35 +02:00