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
..
proguard	fix: add org.session and remove minify to release build	2021-03-16 11:45:02 +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	feat: updating android deps	2021-04-20 17:23:02 +10:00
google-services.json	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
lint-baseline.xml	App's gradle config cleanup.	2020-11-26 12:41:59 +11:00
lint.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00