You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
session-android/app
Morgan Pretty ce3aa980aa Merge remote-tracking branch 'upstream/dev' into message-request-fixes
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/groups/OpenGroupManager.kt
#	libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroup.kt
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt
3 years ago
..
proguard fix: Selected message theme colours and crash fixes (#1025) 3 years ago
src Merge remote-tracking branch 'upstream/dev' into message-request-fixes 3 years ago
.gitignore
build.gradle Merge pull request #1069 from mpretty-cyro/feature/performance-improvements 3 years ago
google-services.json
lint-baseline.xml
lint.xml