jubb b5f41b4383 Merge remote-tracking branch 'upstream/ui' into ui ... # Conflicts: # app/src/main/java/org/thoughtcrime/securesms/components/AlbumThumbnailView.java # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt		2021-06-24 16:26:45 +10:00
..
proguard	fix: add org.session and remove minify to release build	2021-03-16 11:45:02 +11:00
src	Merge remote-tracking branch 'upstream/ui' into ui	2021-06-24 16:26:45 +10:00
.gitignore	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
build.gradle	Make input edit text grow dynamically	2021-06-15 16:14:35 +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