Merge branch 'hotfix/1.0.1'

f9e25290 · Grigory Fedorov · cac564df · 20db3abd · f9e25290 · f9e25290
Commit f9e25290 authored Apr 29, 2015 by Grigory Fedorov
Expand all Show whitespace changes
Inline Side-by-side

Showing with 60 additions and 336 deletions

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

preference_editor.xml app/src/main/res/xml/preference_editor.xml +58 -334

No files found.
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
        applicationId "com.xabber.androiddev"
        minSdkVersion 14
        targetSdkVersion 22
-        versionCode 172
-        versionName '1.0.0'
+        versionCode 173
+        versionName '1.0.1'
    }

    compileOptions {

--- a/app/src/main/res/xml/preference_editor.xml
+++ b/app/src/main/res/xml/preference_editor.xml