Morgan Pretty 87f1d708b1 Merge remote-tracking branch 'upstream/dev' into feature/unread-mention-indicator ... # Conflicts: # app/src/main/res/values/themes.xml		2023-01-24 15:44:22 +11:00
..
androidTest	Menu redesign (#958)	2022-09-30 13:32:07 +10:00
main	Merge remote-tracking branch 'upstream/dev' into feature/unread-mention-indicator	2023-01-24 15:44:22 +11:00
sharedTest/java/org/thoughtcrime/securesms	refactor: Use view binding to replace Kotlin synthetics (#824)	2022-01-14 07:56:15 +02:00
test	Paged conversation recycler, update compile sdk version 31 (#1049)	2022-12-19 11:29:05 +11:00