TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-11-01 04:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into ui

Browse Source 
# Conflicts:
#	app/build.gradle
This commit is contained in:
jubb
2021-07-05 17:32:29 +10:00
parent a593ad6a54 2ef7cbe7e3
commit 95716cc23a
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -143,8 +143,8 @@ dependencies {
testImplementation 'org.robolectric:shadows-multidex:4.2'
}
def canonicalVersionCode = 187
def canonicalVersionName = "1.11.1"
def canonicalVersionCode = 188
def canonicalVersionName = "1.11.0"
def postFixSize = 10
def abiPostFix = ['armeabi-v7a' : 1,