jubb 7459765a52 Merge remote-tracking branch 'upstream/ui' into ui ... # Conflicts: # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt		2021-07-01 11:06:34 +10:00
..
components	Move ExpirationTimerView	2021-06-30 14:47:35 +10:00
dialogs	Scroll to message upon tapping quote & fix various bugs	2021-06-30 10:30:10 +10:00
input_bar	Merge pull request #623 from hjubb/ui	2021-06-30 15:07:03 +10:00
menus	Merge branch 'ui' of https://github.com/oxen-io/session-android into ui	2021-06-30 14:40:00 +10:00
messages	Merge remote-tracking branch 'upstream/ui' into ui	2021-07-01 11:06:34 +10:00
search	fix spinner shows incorrectly the second time open search screen	2021-06-30 10:59:35 +10:00
utilities	fix: links work properly now and the album navigates to open group messages now	2021-06-30 14:29:32 +10:00
ConversationActivityV2.kt	Merge remote-tracking branch 'upstream/ui' into ui	2021-07-01 11:06:34 +10:00
ConversationAdapter.kt	Merge branch 'ui' of https://github.com/oxen-io/session-android into ui	2021-06-30 14:55:30 +10:00
ConversationLoader.kt	Fix conversation updating & stack messages from end	2021-06-04 09:58:04 +10:00
ConversationRecyclerView.kt	Fix scroll to bottom button visibility logic	2021-06-25 10:55:50 +10:00