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
History
jubb d48f68afc2 Merge remote-tracking branch 'upstream/ui' into ui 
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
2021-06-23 13:18:00 +10:00
..
assets restructure and unite service android/java to libsignal 2020-11-26 09:46:52 +11:00
java/org/thoughtcrime/securesms Merge remote-tracking branch 'upstream/ui' into ui 2021-06-23 13:18:00 +10:00
protobuf Unused code cleanup. 2020-12-02 23:01:04 +11:00
res Re-add open group guidelines 2021-06-23 13:11:21 +10:00
AndroidManifest.xml Re-add open group guidelines 2021-06-23 13:11:21 +10:00