jubb 07ccc2696b Merge remote-tracking branch 'upstream/dev' ... # Conflicts: # app/build.gradle		2022-02-07 17:08:48 +11:00
..
assets	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
java/org/thoughtcrime/securesms	Merge remote-tracking branch 'upstream/dev'	2022-02-07 17:08:48 +11:00
protobuf	Unused code cleanup.	2020-12-02 23:01:04 +11:00
res	Add a global search (#834)	2022-02-07 17:06:27 +11:00
AndroidManifest.xml	re-introduce the message detail screen	2021-07-13 16:22:10 +10:00