TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-03 06:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
b5f41b4383
session-android/app/src/main/java
History
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
..
org/thoughtcrime/securesms Merge remote-tracking branch 'upstream/ui' into ui 2021-06-24 16:26:45 +10:00