Change-Id: I7a9ebbae6df28044a8fa308fe34241dbd1d8b8ae Conflicts: vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt |
||
|---|---|---|
| .. | ||
| androidTest/java/im/vector/app | ||
| debug | ||
| fdroid | ||
| fdroidRustCryptoNightly/res/values | ||
| gplay | ||
| main | ||
| nightly/res | ||
| release | ||