mirror of
https://github.com/syncthing/syncthing-android.git
synced 2024-12-23 03:11:30 +00:00
Merge branch 'release' into main
This commit is contained in:
commit
f414fbfab6
3 changed files with 4 additions and 4 deletions
|
@ -40,8 +40,8 @@ android {
|
|||
applicationId "com.nutomic.syncthingandroid"
|
||||
minSdkVersion 16
|
||||
targetSdkVersion 28
|
||||
versionCode 4252
|
||||
versionName "1.11.0"
|
||||
versionCode 4253
|
||||
versionName "1.11.1"
|
||||
testApplicationId 'com.nutomic.syncthingandroid.test'
|
||||
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
|
||||
}
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
* Add Internal Activity for QR Code Scanner ( https://github.com/syncthing/syncthing-android/pull/1556 )
|
||||
* Update Syncthing to v1.11.0 ( https://github.com/syncthing/syncthing/releases/tag/v1.11.0 )
|
||||
* Update Syncthing to v1.11.1 ( https://github.com/syncthing/syncthing/releases/tag/v1.11.1 )
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 1c2be84e4e0140ad4e894822b5188fc30a73442f
|
||||
Subproject commit 2b9cef3ae5fff590ed993871188f70ce2fbbc1d0
|
Loading…
Reference in a new issue