ganfra 880da9ecd5 Merge branch 'develop' into feature/fga/dial_pad_tab ... # Conflicts: # vector/src/main/java/im/vector/app/features/call/dialpad/DialPadFragment.kt # vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt		2021-06-10 15:37:24 +02:00
..
sampledata	Split sample step 3: rooms and spaces	2021-05-10 23:07:08 +02:00
signature	…
src	Merge branch 'develop' into feature/fga/dial_pad_tab	2021-06-10 15:37:24 +02:00
.gitignore	…
build.gradle	use multidex from androidx and not android support	2021-06-09 20:49:56 +02:00
lint.xml	Ignore lint false positive	2021-05-18 21:23:50 +02:00
proguard-rules.pro	…