Adam Brown 145ceacf78 fixing auto merge issues		2021-11-08 15:24:08 +00:00
..
sampledata
signature
src	fixing auto merge issues	2021-11-08 15:24:08 +00:00
.gitignore
build.gradle	Merge pull request #4363 from vector-im/feature/fga/rx_flow_migration	2021-11-04 18:44:48 +01:00
lint.xml
proguard-rules.pro