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
..
signature	introducing vector-app module to act as the top level application	2022-08-31 09:16:00 +01:00
src	Merge remote-tracking branch 'origin/develop' into feature/eric/msc3881	2022-10-04 14:05:23 -04:00
build.gradle	Bump kotlin-reflect from 1.7.10 to 1.7.20	2022-09-29 23:21:58 +00:00
proguard-rules.pro	introducing vector-app module to act as the top level application	2022-08-31 09:16:00 +01:00