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
..
src	Merge remote-tracking branch 'upstream/dev' into feature/unread-mention-indicator	2023-01-24 15:44:22 +11:00
.gitignore	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
build.gradle	Paged conversation recycler, update compile sdk version 31 (#1049)	2022-12-19 11:29:05 +11:00