Skip to content

Commit 1481381

Browse files
author
Grigory Fedorov
committed
Merge branch 'release/1.0.30'
2 parents 7695493 + 2a8929c commit 1481381

71 files changed

Lines changed: 40 additions & 22 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

LICENSE

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,9 @@ The Jabber logo is licensed under the Creative Commons Attribution License
6262
app/src/main/res/drawable*/ic_vcard_jabber_24dp.png
6363

6464
Xabber, Redsolution logo are trademarks of Redsolution Inc., and are licensed under Creative Commons Attribution-NoDerivs license:
65-
app/src/main/res/drawable*/ic_connect.png
66-
app/src/vip/res/drawable*/ic_connect.png
67-
app/src/main/res/drawable*/ic_disconnect.png
68-
app/src/vip/res/drawable*/ic_disconnect.png
69-
app/src/main/res/drawable*/ic_launcher.png
70-
app/src/vip/res/drawable*/ic_launcher.png
71-
app/src/main/res/drawable*/redsolution_logo*.9.png
65+
app/src/*/res/drawable*/xabber_logo*.png
66+
app/src/main/res/drawable*/redsolution_logo*.png
67+
app/src/*/res/mipmap*/ic_launcher.png
7268

7369
Following file is part of The Android Open Source Project licensed under the Apache License, Version 2.0 (the "License") (see assets/LICENSE-Apache2.txt):
7470
app/src/main/res/layout/preference.xml

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ android {
77
defaultConfig {
88
minSdkVersion 14
99
targetSdkVersion 22
10-
versionCode 201
11-
versionName '1.0.29'
10+
versionCode 202
11+
versionName '1.0.30'
1212
}
1313

1414
compileOptions {
15.2 KB
11.5 KB
8.2 KB
6.4 KB
23.5 KB
17.2 KB
44.2 KB
32 KB

0 commit comments

Comments
 (0)