aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-03-27 17:18:52 +0200
committerlookshe <github@lookshe.org>2016-03-27 17:18:52 +0200
commit0fab4767fd518bd7cf0db3a9aa99294547ed98cb (patch)
treed95ffe3af8db4f8fb00f297f7ea8cd692c223356
parenta3bfd4a30256dcdd65b06c2b5b3082b0a06b74be (diff)
parentfd6f0a842b61b0f4d1b90f798ebc96eb7da022f0 (diff)
Merge branch 'trz/rename' into trz/rebase
-rw-r--r--Conversations-Plus-ChangeLog.md10
-rw-r--r--build.gradle2
2 files changed, 10 insertions, 2 deletions
diff --git a/Conversations-Plus-ChangeLog.md b/Conversations-Plus-ChangeLog.md
index ca031f15..3e356265 100644
--- a/Conversations-Plus-ChangeLog.md
+++ b/Conversations-Plus-ChangeLog.md
@@ -1,5 +1,13 @@
###Conversations+ ChangeLog
+####Version 0.0.7
+* Fixes FS#139: Do not merge messages at all
+* Fixes FS#51: Change toggle in Account Management back to standard
+* Fixes FS#167: Resized images are larger than original images
+* Fixes FS#135: disable notification for received/downloaded images when link is received through mam or carbons
+* Fixes FS#156: load of mam messages result in unread messages
+* Fixes FS#166: Images cannot be opened since storing in private image folder
+
####Version 0.0.6
* Implements FS#111: Compress resized picture with PNG format
* Fixes FS#107: Account can be edited while online
@@ -30,4 +38,4 @@
* Fixes FS#66: Add option to popup menu to open message details
* Fixes FS#65: Message Details
* Fixes FS#56: Create new logo
-* Fixes FS#54: Add new options to message menu \ No newline at end of file
+* Fixes FS#54: Add new options to message menu
diff --git a/build.gradle b/build.gradle
index bf6a8272..15250f84 100644
--- a/build.gradle
+++ b/build.gradle
@@ -65,7 +65,7 @@ android {
minSdkVersion 14
targetSdkVersion 23
versionCode 134
- versionName "1.11.2"
+ versionName "1.11.2.1"
archivesBaseName += "-$versionName"
}