1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2025-02-02 15:21:36 +00:00

Merge 0.10.17-beta4 into master (#1269)

* Bumped version to 0.10.17-beta2

* Discard invalid locale

* Imported translations

* Bumped version to 0.10.17-beta3

* Discard invalid locale

* Imported translations

* Bumped version to 0.10.17-beta4
This commit is contained in:
Audrius Butkevicius 2019-02-11 20:57:24 +00:00 committed by GitHub
parent 095548e807
commit ab91c498ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 8 additions and 27 deletions

View file

@ -35,8 +35,8 @@ android {
applicationId "com.nutomic.syncthingandroid"
minSdkVersion 16
targetSdkVersion 26
versionCode 4151
versionName "0.10.17-beta1"
versionCode 4154
versionName "0.10.17-beta4"
testApplicationId 'com.nutomic.syncthingandroid.test'
testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
playAccountConfig = playAccountConfigs.defaultAccountConfig
@ -81,8 +81,10 @@ play {
* Some languages are not supported by Google Play, so we ignore them.
*/
task deleteUnsupportedPlayTranslations(type: Delete) {
delete 'src/main/play/nn'
delete 'src/main/play/el-EL'
delete 'src/main/play/nb'
delete 'src/main/play/nn/'
delete 'src/main/play/el-EL/'
delete 'src/main/play/nb/'
delete 'src/main/play/en/'
delete 'src/main/play/ta/'
delete 'src/main/play/eu/'
}

View file

@ -1,3 +1,4 @@
* Update syncthing to v1.0.1
* Fix app getting killed by activity manager in Android 8+ (thanks Catfriend1 for backport)
* Show reasons for disabled service in notification dialog (#1264)

View file

@ -1,9 +0,0 @@
Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the Internet.
Website: https://syncthing.net/
Source code: https://github.com/syncthing/syncthing-android
Forum: https://forum.syncthing.net/
Issues: https://github.com/syncthing/syncthing-android/issues

View file

@ -1 +0,0 @@
Open, trustworthy and decentralized file synchronization

View file

@ -1 +0,0 @@
Syncthing

View file

@ -1,9 +0,0 @@
Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the Internet.
Website: https://syncthing.net/
Source code: https://github.com/syncthing/syncthing-android
Forum: https://forum.syncthing.net/
Issues: https://github.com/syncthing/syncthing-android/issues

View file

@ -1 +0,0 @@
Open, trustworthy and decentralized file synchronization

View file

@ -1 +0,0 @@
Syncthing