nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2025-01-23 10:25:54 +00:00
Code Releases Activity

Merge branch 'release'

Browse source
This commit is contained in:
Simon Frei 2022-11-10 17:52:20 +01:00
commit fb4fc9516c
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -42,8 +42,8 @@ android {
applicationId "com.nutomic.syncthingandroid"
minSdkVersion 16
targetSdkVersion 30
versionCode 4324
versionName "1.22.1"
versionCode 4325
versionName "1.22.1.1"
testApplicationId 'com.nutomic.syncthingandroid.test'
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
}

1
app/src/main/play/release-notes/en-GB/default.txt
View file

@ -1,3 +1,4 @@
* Update Syncthing to v1.22.1 ( https://github.com/syncthing/syncthing/releases/tag/v1.22.1 )
* Don't create spurious conflicts (cherry-picked on top of syncthing v1.22.1)
* add preference to run always (ignore run conditions) #1823
* Remove Syncthing from Recents after pressing Exit #1805

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

@ -1 +1 @@
Subproject commit abb921acbc21191f18ac4a6884f5296acb216e86
Subproject commit 15c0afec055b935870b05af4483a0598d2e84dbb