jubb 34750d7d34 Merge remote-tracking branch 'upstream/dev' into calls ... # Conflicts: # 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/Storage.kt # app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java # app/src/main/res/values/strings.xml # app/src/main/res/values/styles.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 # libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java		2022-03-07 09:46:06 +11:00
..
androidTest/java/org/session/libsession	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
main	Merge remote-tracking branch 'upstream/dev' into calls	2022-03-07 09:46:06 +11:00
test/java/org/session/libsession	Minor refactoring	2021-05-17 13:57:18 +10:00