ericdecanini c73c36eb26 Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent ... # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo032.kt # vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt # vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt		2022-07-18 15:05:04 +02:00
..
anim
color
drawable
drawable-anydpi-v26
drawable-hdpi
drawable-ldrtl
drawable-mdpi
drawable-night-hdpi
drawable-night-mdpi
drawable-night-xhdpi
drawable-night-xxhdpi
drawable-night-xxxhdpi
drawable-nodpi
drawable-xhdpi
drawable-xxhdpi
drawable-xxxhdpi
layout	Merge pull request #6542 from vector-im/feature/mna/lls-standardise-stop-text	2022-07-18 10:43:43 +02:00
layout-land
menu
mipmap-anydpi-v26
mipmap-hdpi
mipmap-mdpi
mipmap-xhdpi
mipmap-xxhdpi
mipmap-xxxhdpi	Update application icons.	2020-07-08 12:55:15 +03:00
raw
values	Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent	2022-07-18 15:05:04 +02:00
values-ab
values-ang
values-ar
values-az
values-b+sr+Latn
values-bg
values-bn
values-bn-rBD
values-bn-rIN
values-bs
values-ca
values-cs
values-cy
values-da
values-de
values-el
values-en-rGB
values-eo
values-es
values-es-rMX
values-et
values-eu
values-fa
values-fi
values-fr
values-fr-rCA
values-fy
values-ga
values-gl
values-hr
values-hu
values-in
values-is
values-it
values-iw
values-ja
values-kaa
values-kab
values-ko
values-ku
values-lo
values-lt
values-lv
values-mk
values-ml
values-nb-rNO
values-nl
values-nn
values-pa
values-pl
values-pt
values-pt-rBR
values-ro
values-ru
values-rue
values-si
values-sk
values-sl
values-sq
values-sr
values-sv
values-szl
values-ta
values-te
values-th
values-tlh
values-tr
values-tzm
values-uk
values-uz
values-vi
values-vls
values-zh-rCN
values-zh-rTW
xml