element-android-Github/matrix-sdk-android/src/main
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
..
assets Try to communicate with WidgetPostAPI 2020-05-13 20:04:08 +02:00
java/org/matrix Merge branch 'develop' into feature/fga/dial_pad_tab 2021-06-10 15:37:24 +02:00
res Import SAS strings 2021-04-07 18:42:52 +02:00
AndroidManifest.xml Fix some of the non-passing tests 2020-10-13 09:47:34 +02:00