mirror of
https://github.com/oxen-io/session-android.git
synced 2024-12-24 00:37:47 +00:00
Merge branch 'u-master' into u-dev
This commit is contained in:
commit
db61d693c4
@ -157,7 +157,7 @@ dependencies {
|
||||
testImplementation 'org.robolectric:shadows-multidex:4.4'
|
||||
}
|
||||
|
||||
def canonicalVersionCode = 307
|
||||
def canonicalVersionCode = 309
|
||||
def canonicalVersionName = "1.16.0"
|
||||
|
||||
def postFixSize = 10
|
||||
|
@ -67,6 +67,7 @@ import org.thoughtcrime.securesms.util.IP2Country
|
||||
import org.thoughtcrime.securesms.util.disableClipping
|
||||
import org.thoughtcrime.securesms.util.push
|
||||
import org.thoughtcrime.securesms.util.show
|
||||
import org.thoughtcrime.securesms.util.themeState
|
||||
import java.io.IOException
|
||||
import java.util.Locale
|
||||
import javax.inject.Inject
|
||||
|
Loading…
x
Reference in New Issue
Block a user