Benoit Marty 844fe2c4cd Merge branch 'develop' into feature/bca/crypto_store_outbound		2021-01-14 10:43:38 +01:00
..
assets	Remove dependency to org.greenrobot.eventbus library	2021-01-05 18:56:24 +01:00
java/im/vector/app	Merge branch 'develop' into feature/bca/crypto_store_outbound	2021-01-14 10:43:38 +01:00
res	Merge pull request #2664 from vector-im/feature/ons/emoji_keyboard_settings	2021-01-14 10:17:33 +01:00
AndroidManifest.xml	Fix switch theme issue, and white field issue (#2599, #2528)	2021-01-08 15:55:32 +01:00