ericdecanini 034046701d Merge remote-tracking branch 'origin/develop' into feature/eric/msc3881 ...

# Conflicts:
#	vector/src/test/java/im/vector/app/test/fakes/FakeCryptoService.kt

2022-10-04 14:05:23 -04:00

..

sampledata

Add required resources.

2022-05-27 15:25:59 +03:00

src

Merge remote-tracking branch 'origin/develop' into feature/eric/msc3881

2022-10-04 14:05:23 -04:00

.gitignore

…

build.gradle

Support inline images in the timeline (#5877)

2022-10-04 17:59:52 +02:00