Merge pull request #1694 from RocketChat/beta

[RELEASE] 2.6.1

Merge pull request #1694 from RocketChat/beta
[RELEASE] 2.6.1
20ce8107 · Rafael Kellermann Streit · GitHub · 22c57a15 · 2b41c7d1 · 20ce8107
Unverified Commit 20ce8107 authored Sep 21, 2018 by Rafael Kellermann Streit Committed by GitHub Sep 21, 2018
Expand all Show whitespace changes
Inline Side-by-side

Showing with 93 additions and 90 deletions

build.gradle app/build.gradle +2 -2

strings.xml app/src/main/res/values-fr/strings.xml +91 -88

No files found.
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
        applicationId "chat.rocket.android"
        minSdkVersion versions.minSdk
        targetSdkVersion versions.targetSdk
-        versionCode 2042
-        versionName "2.6.0"
+        versionCode 2043
+        versionName "2.6.1"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        multiDexEnabled true


--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml