Benoit Marty 9802ed08e3 Merge branch 'feature/bma/new_commands' of github.com:vector-im/element-android into feature/bma/new_commands ... # Conflicts: # vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt # vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt		2021-10-04 16:00:31 +02:00
..
sampledata	textSize 15sp -> android:textAppearance="@style/VectorTextAppearanceSubtitle or Body	2021-06-14 22:10:12 +02:00
signature
src	Merge branch 'feature/bma/new_commands' of github.com:vector-im/element-android into feature/bma/new_commands	2021-10-04 16:00:31 +02:00
.gitignore
build.gradle	Merge pull request #4049 from vector-im/dependabot/gradle/com.arthenica-ffmpeg-kit-audio-4.5	2021-09-29 17:10:31 +02:00
lint.xml	SpUsage lint rule is more about a11y	2021-09-14 15:57:24 +02:00
proguard-rules.pro	Fix Authenticated Jitsi not working in release #3841	2021-08-16 15:43:35 +02:00