TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-05-01 15:30:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
session-android/libsession/src
History
SessionHero01 0bc933dcec
Merge remote-tracking branch 'origin/dev' into closed_groups 
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
#	app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
#	app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java
#	app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsViewModel.kt
#	app/src/main/res/layout/activity_conversation_v2.xml
#	app/src/test/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModelTest.kt
2024-10-22 15:57:22 +11:00
..
androidTest/java/org/session/libsession
Strings work
2024-09-06 08:30:03 +10:00
debug/res/values
Fix debug screen security default (#1256)
2023-06-30 10:05:32 +09:30
main
Merge remote-tracking branch 'origin/dev' into closed_groups
2024-10-22 15:57:22 +11:00
test/java/org/session/libsession
Strings work
2024-09-06 08:30:03 +10:00