moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-05 08:45:02 -05:00
Code Issues Releases Wiki Activity

Merge branch 'master' into development

Browse Source
This commit is contained in:
Daniel Gultsch 2015-08-23 21:06:58 +02:00
commit deb9c20e5e
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,5 +1,8 @@
###Changelog
####Version 1.6.3
* bug fixes
####Version 1.6.2
* fixed issues with connection time out when server does not support ping

2
build.gradle
View File

@ -48,7 +48,7 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 21
versionCode 86
versionCode 87
versionName "1.7.0-alpha"
}

2
src/main/java/eu/siacs/conversations/utils/MimeUtils.java
View File

@ -458,7 +458,7 @@ public final class MimeUtils {
if (extension == null || extension.isEmpty()) {
return null;
}
return extensionToMimeTypeMap.get(extension);
return extensionToMimeTypeMap.get(extension.toLowerCase());
}
/**
* Returns true if the given extension has a registered MIME type.