session-android/libsignal
jubb 7f0962b3d4 Merge branch 'fix_profile_nulls' into open_groups_V2
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
#	app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
#	libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt
2021-04-28 13:53:50 +10:00
..
protobuf DataExtractionNotification type created and added to proto 2021-03-09 16:27:12 +11:00
src Merge branch 'fix_profile_nulls' into open_groups_V2 2021-04-28 13:53:50 +10:00
.gitignore restructure and unite service android/java to libsignal 2020-11-26 09:46:52 +11:00
build.gradle clean logging 2021-02-03 12:22:40 +11:00
consumer-rules.pro restructure and unite service android/java to libsignal 2020-11-26 09:46:52 +11:00
proguard-rules.pro restructure and unite service android/java to libsignal 2020-11-26 09:46:52 +11:00