nutomic
/
syncthing-android
mirror of https://github.com/syncthing/syncthing-android.git
1
0
Fork 0
Code Releases Activity

Merge branch 'release' into main

This commit is contained in:
Simon Frei 2020-11-10 09:50:40 +01:00
parent 0dacef3edc 72b1e9413c
commit f414fbfab6
No known key found for this signature in database
GPG Key ID: 7C31D23ECB1006F3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -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'
}

2
app/src/main/play/release-notes/en-GB/default.txt
View File

@ -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 )

2
syncthing/src/github.com/syncthing/syncthing

@ -1 +1 @@
Subproject commit 1c2be84e4e0140ad4e894822b5188fc30a73442f
Subproject commit 2b9cef3ae5fff590ed993871188f70ce2fbbc1d0