Harris e689ab9753 Merge remote-tracking branch 'origin/calls' 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/messages/ControlMessageView.kt # app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java # app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt # app/src/main/res/values/strings.xml # libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt # libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt		2022-03-17 17:32:32 +11:00
..
java/org/thoughtcrime/securesms	Merge remote-tracking branch 'origin/calls' into calls	2022-03-17 17:32:32 +11:00
resources/data	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00