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
..
protobuf	feat: include latest proto	2021-10-21 14:27:34 +11:00
src	Merge remote-tracking branch 'upstream/master' into calls	2022-02-08 09:58:57 +11:00
.gitignore	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
build.gradle	refactor: remove PersistentLogger.java and fix libsignal build.gradle minSdkVersion	2021-07-15 16:56:13 +10:00