David Langley 9c139b3bd0 Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/fix_account_notifications_discrepancies		2021-07-26 22:55:27 +01:00
..
assets	Update forbidden_terms.txt	2021-04-08 18:26:55 +01:00
java/im/vector/app	Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/fix_account_notifications_discrepancies	2021-07-26 22:55:27 +01:00
res	Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/fix_account_notifications_discrepancies	2021-07-26 22:55:27 +01:00
AndroidManifest.xml	Rename themes follow Android conventions	2021-06-16 12:34:14 +02:00