summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-04-04 17:02:11 -0300
committerTomás Touceda <chiiph@leap.se>2014-04-04 17:02:11 -0300
commitb6bbb3ccb4680a742e473a548fb0762cad234091 (patch)
tree26d10a14add9864380a04c3be87c6c103bf191ad
parent4b9309cf720ca0d7292986b209abaa5e538e6f7b (diff)
Fold in changes
-rw-r--r--CHANGELOG7
-rw-r--r--changes/bug_4475_use-couch-document1
-rw-r--r--changes/bug_multiple_encodings1
3 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 9de1ed7..04833b4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+0.3.6 Apr 4:
+ o Use CouchDocument to comply with new Soledad couch backend. Fixes
+ #4475.
+ o Some emails are multipart and each part has its own encoding.
+
+-- 2014 --
+
0.3.5 Dec 10:
o Add X-Leap-Provenance header. Closes #4356.
o Add tester script to ease testing problematic emails offline.
diff --git a/changes/bug_4475_use-couch-document b/changes/bug_4475_use-couch-document
deleted file mode 100644
index 54c6897..0000000
--- a/changes/bug_4475_use-couch-document
+++ /dev/null
@@ -1 +0,0 @@
- o Use CouchDocument to comply with new Soledad couch backend (#4475).
diff --git a/changes/bug_multiple_encodings b/changes/bug_multiple_encodings
deleted file mode 100644
index 3113328..0000000
--- a/changes/bug_multiple_encodings
+++ /dev/null
@@ -1 +0,0 @@
- o Some emails are multipart and each part has its own encoding. \ No newline at end of file