ganfra b7dd7ef3e0 Timeline merging: branch virtual room (still some issues to deal with)		2021-06-11 19:27:07 +02:00
..
sampledata
signature
src	Timeline merging: branch virtual room (still some issues to deal with)	2021-06-11 19:27:07 +02:00
.gitignore
build.gradle	Merge pull request #3488 from vector-im/dependabot/gradle/daggerVersion-2.37	2021-06-11 12:24:49 +02:00
lint.xml	Remove useless parent	2021-06-11 10:22:18 +02:00
proguard-rules.pro