Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/android.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Kaminsky <tobias@kaminsky.me>2020-04-23 12:16:06 +0300
committerGitHub <noreply@github.com>2020-04-23 12:16:06 +0300
commit904dc766510816aab3f2514c5a77066d9186111c (patch)
tree43c0a1eff4f3033187fb03fea7970f6efb920216
parentac776116e78abecdefd8d23973194f919fc5bc04 (diff)
parent30d9c54e47c66e52c79d8210c5aa068291d1341c (diff)
Merge pull request #5921 from nextcloud/3.11.1stable-3.11.1
Bump to 3.11.1
-rw-r--r--build.gradle4
-rw-r--r--fastlane/metadata/android/en-US/changelogs/30110190.txt10
2 files changed, 12 insertions, 2 deletions
diff --git a/build.gradle b/build.gradle
index eaed2544f1..3636a27fa5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -63,7 +63,7 @@ ext {
daggerVersion = "2.26"
markwonVersion = "4.2.2"
prismVersion = "2.0.0"
- androidLibraryVersion = "rc-2.1.1-01"
+ androidLibraryVersion = "2.1.1"
travisBuild = System.getenv("TRAVIS") == "true"
@@ -86,7 +86,7 @@ repositories {
def versionMajor = 3
def versionMinor = 11
def versionPatch = 1
-def versionBuild = 51 // 0-50=Alpha / 51-98=RC / 90-99=stable
+def versionBuild = 90 // 0-50=Alpha / 51-98=RC / 90-99=stable
for (TaskExecutionRequest tr : getGradle().getStartParameter().getTaskRequests()) {
for (String arg : tr.args) {
diff --git a/fastlane/metadata/android/en-US/changelogs/30110190.txt b/fastlane/metadata/android/en-US/changelogs/30110190.txt
new file mode 100644
index 0000000000..3fd5be739c
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/30110190.txt
@@ -0,0 +1,10 @@
+3.11.1 (April, 23, 2020)
+
+- Crash while browsing files
+- auto upload:
+ - fix wrong conflict detection on custom folder
+ - allow to choose default conflict strategy @fodinabor
+ - fix hanging UI after saving
+- open office files online if no local app installed
+
+For a full list, please see https://github.com/nextcloud/android/milestone/47