From 256a11aa075a8a240f0023b3d0604c679f1ddff7 Mon Sep 17 00:00:00 2001
From: Conny Duck <k.pozniak@gmx.at>
Date: Wed, 25 Oct 2017 11:13:33 +0200
Subject: [PATCH] Release 27

---
 app/build.gradle                       | 4 ++--
 app/src/main/res/values-nl/strings.xml | 1 -
 app/src/main/res/values-ru/strings.xml | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index cf11a128..f8f3c07f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.keylesspalace.tusky"
         minSdkVersion 15
         targetSdkVersion 26
-        versionCode 26
-        versionName "1.2.0"
+        versionCode 27
+        versionName "1.2.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary true
     }
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index fe12687b..96817b8e 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -167,7 +167,6 @@
     <string name="status_media_images">Afbeeldingen</string>
     <string name="status_media_video">Video</string>
     <string name="state_follow_requested">Volgverzoek verzonden</string>
-    <string name="combine_s1_s2">%1$s %2$s</string>
     <string name="no_content">geen inhoud</string>
     <string name="action_save_one_toot">Toot opgeslagen!</string>
 
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 8d58a7a1..958c8fa7 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -201,7 +201,6 @@
 
     <string name="state_follow_requested">Запрошенные подписки</string>
 
-	<string name="combine_s1_s2">%1$s %2$s</string>
     <string name="no_content">ничего нет</string>
     <string name="action_save_one_toot">Пост сохранён!</string>