nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-29 07:41:17 +00:00
Code Releases Activity

Merge branch 'release' into main

Browse source
This commit is contained in:
Simon Frei 2020-11-03 11:32:03 +01:00
commit 0dacef3edc
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 4249
versionName "1.11.0-rc.1.1"
versionCode 4252
versionName "1.11.0"
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-rc.1 ( https://github.com/syncthing/syncthing/releases/tag/v1.11.0-rc.1 )
* Update Syncthing to v1.11.0 ( https://github.com/syncthing/syncthing/releases/tag/v1.11.0 )

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

@ -1 +1 @@
Subproject commit d828adb648997c563bbcdbdbafd1980c574db65b
Subproject commit 1c2be84e4e0140ad4e894822b5188fc30a73442f