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
..
src	Merge branch 'develop' into feature/fga/dial_pad_tab	2021-06-10 15:37:24 +02:00
.gitignore	…
build.gradle	Upgrade Olm dependency to 3.2.4	2021-06-02 10:05:14 +02:00
lint.xml	…
proguard-rules.pro	Remove dependency to org.greenrobot.eventbus library	2021-01-05 18:56:24 +01:00