oxen-io/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2023-12-14 02:53:01 +01:00
Code Issues 1 Projects Releases Wiki Activity
session-android/app/src/main/java
History
Morgan Pretty bc20811431 Merge remote-tracking branch 'upstream/dev' into feature/read_status_updates 
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
#	app/src/main/res/values/strings.xml
2023-01-24 14:10:14 +11:00
..
org/thoughtcrime/securesms Merge remote-tracking branch 'upstream/dev' into feature/read_status_updates 2023-01-24 14:10:14 +11:00