mirror of
https://github.com/syncthing/syncthing-android.git
synced 2024-12-27 05:11:30 +00:00
Merge branch 'release'
This commit is contained in:
commit
7af7d17a25
3 changed files with 4 additions and 4 deletions
|
@ -35,8 +35,8 @@ android {
|
|||
applicationId "com.nutomic.syncthingandroid"
|
||||
minSdkVersion 16
|
||||
targetSdkVersion 26
|
||||
versionCode 4165
|
||||
versionName "1.1.2-rc.1"
|
||||
versionCode 4166
|
||||
versionName "1.1.2"
|
||||
testApplicationId 'com.nutomic.syncthingandroid.test'
|
||||
testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
|
||||
playAccountConfig = playAccountConfigs.defaultAccountConfig
|
||||
|
|
|
@ -1 +1 @@
|
|||
* Update syncthing to v1.1.2-rc.1
|
||||
* Update syncthing to v1.1.2
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit ca823bd591907ea6eb6625b3a0c54825c79ed7c8
|
||||
Subproject commit a54d7a32d1f308be63837f1b31d9f468940fc5ef
|
Loading…
Reference in a new issue