Merge tag '1.0.20' into develop

1.0.20

Merge tag '1.0.20' into develop
1.0.20
c8aecb52 · Grigory Fedorov · ea23b18b · 22303c10 · c8aecb52 · c8aecb52
Commit c8aecb52 authored Jun 16, 2015 by Grigory Fedorov
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

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

about_viewer.xml app/src/main/res/values/about_viewer.xml +1 -1

No files found.
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
    defaultConfig {
        minSdkVersion 14
        targetSdkVersion 22
-        versionCode 191
-        versionName '1.0.19'
+        versionCode 192
+        versionName '1.0.20'
    }

    compileOptions {

--- a/app/src/main/res/values/about_viewer.xml
+++ b/app/src/main/res/values/about_viewer.xml
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources  xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
    <string name="about_open_source_xmpp_client">open source XMPP client</string>

    <string name="about_header_about">About</string>