SchildiChat-android/matrix-sdk-android
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
..
2018-10-03 17:58:12 +02:00
2021-06-02 10:05:14 +02:00