jubb 38164ea23d Merge remote-tracking branch 'upstream/master' into calls ... # Conflicts: # app/build.gradle # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt # app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt # app/src/main/res/values/strings.xml # gradle.properties # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPollerV2.kt # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPollerV2.kt # libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt		2022-02-08 09:58:57 +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/master' into calls	2022-02-08 09:58:57 +11:00
protobuf	Unused code cleanup.	2020-12-02 23:01:04 +11:00
res	Merge remote-tracking branch 'upstream/master' into calls	2022-02-08 09:58:57 +11:00
AndroidManifest.xml	fix: various bug fixes for calls	2021-12-08 17:29:10 +11:00