Benoit Marty 1eb374fa49 Merge pull request #188 from vector-im/feature/disambiguation ... Disambiguation of display names		2019-06-20 17:29:01 +02:00
..
sampledata
signature
src	Merge pull request #188 from vector-im/feature/disambiguation	2019-06-20 17:29:01 +02:00
.gitignore
build.gradle
lint.xml
proguard-rules.pro