1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-12-23 11:21:29 +00:00

Merge branch 'release'

This commit is contained in:
Simon Frei 2020-04-08 13:44:43 +02:00
commit 63ceb72e0b
3 changed files with 4 additions and 4 deletions

View file

@ -35,8 +35,8 @@ android {
applicationId "com.nutomic.syncthingandroid" applicationId "com.nutomic.syncthingandroid"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 28 targetSdkVersion 28
versionCode 4223 versionCode 4224
versionName "1.4.1" versionName "1.4.2"
testApplicationId 'com.nutomic.syncthingandroid.test' testApplicationId 'com.nutomic.syncthingandroid.test'
testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner' testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
} }

View file

@ -1 +1 @@
* Update Syncthing to v1.4.1 ( https://github.com/syncthing/syncthing/releases/tag/v1.4.1 ) * Update Syncthing to v1.4.2 ( https://github.com/syncthing/syncthing/releases/tag/v1.4.2 )

@ -1 +1 @@
Subproject commit f1b253fc0009e6e143b1e35d67599fb9c1970879 Subproject commit 0f532a5607d0bdd5d1906aa268f845c16c3246b4