oogm 7453509df4 Merge remote-tracking branch 'upstream/develop' into develop		2021-03-26 14:09:21 +01:00
..
assets	Cleanup HTML	2021-02-12 16:21:55 +01:00
java/im/vector/app	Merge remote-tracking branch 'upstream/develop' into develop	2021-03-26 14:09:21 +01:00
res	Merge remote-tracking branch 'upstream/develop' into develop	2021-03-26 14:09:21 +01:00
AndroidManifest.xml	To squash	2021-02-23 11:28:38 +01:00