sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into development

This commit is contained in:
Daniel Gultsch 2015-07-03 13:09:05 +02:00
parent c745fbb562 bfe1d2489a
commit 1c86098f3b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -45,8 +45,8 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 21
versionCode 73
versionName "1.4.5"
versionCode 74
versionName "1.4.6"
}
compileOptions {

1
src/main/java/eu/siacs/conversations/utils/DNSHelper.java
View File

@ -105,6 +105,7 @@ public class DNSHelper {
for(int i = 0; i < response.getAnswers().length; ++i) {
values.add(createNamePortBundle(host,5222,response.getAnswers()[i].getPayload()));
}
values.add(createNamePortBundle(host,5222));
bundle.putParcelableArrayList("values", values);
return bundle;
}