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
..
docs	Package have been renamed, so also rename it here.	2022-05-20 21:14:42 +02:00
src	Merge remote-tracking branch 'origin/develop' into feature/eric/msc3881	2022-10-04 14:05:23 -04:00
.gitignore
build.gradle	version 1.5.1	2022-09-28 16:28:43 +02:00
proguard-rules.pro