summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-10-18 09:21:23 -0300
committerTomás Touceda <chiiph@leap.se>2013-10-18 09:21:23 -0300
commitd8f65603a63addea0b4056693992d479869b93a3 (patch)
tree5a57a0771a98edcc35225d41f2e9cf2710938be9
parentb8ce583370940eb9f154425f14170597c53781c6 (diff)
Fold in changes and update dependencies
-rw-r--r--mail/CHANGELOG4
-rw-r--r--mail/changes/VERSION_COMPAT1
-rw-r--r--mail/changes/bug_donot_log_mail_docs1
-rw-r--r--mail/changes/feature_4029-comply-with-rfc31591
-rw-r--r--mail/pkg/requirements.pip2
5 files changed, 5 insertions, 4 deletions
diff --git a/mail/CHANGELOG b/mail/CHANGELOG
index 45f1a7fb..319fda59 100644
--- a/mail/CHANGELOG
+++ b/mail/CHANGELOG
@@ -1,3 +1,7 @@
+0.3.5 Oct 18:
+ o Do not log mail doc contents.
+ o Comply with RFC 3156. Closes #4029.
+
0.3.4 Oct 4:
o Improve charset handling when exposing mails to the mail
client. Related to #3660.
diff --git a/mail/changes/VERSION_COMPAT b/mail/changes/VERSION_COMPAT
index db38edcd..cc00ecf7 100644
--- a/mail/changes/VERSION_COMPAT
+++ b/mail/changes/VERSION_COMPAT
@@ -8,4 +8,3 @@
#
# BEGIN DEPENDENCY LIST -------------------------
# leap.foo.bar>=x.y.z
-leap.keymanager>=0.3.4
diff --git a/mail/changes/bug_donot_log_mail_docs b/mail/changes/bug_donot_log_mail_docs
deleted file mode 100644
index 5619d8a7..00000000
--- a/mail/changes/bug_donot_log_mail_docs
+++ /dev/null
@@ -1 +0,0 @@
- o Do not log mail doc contents. \ No newline at end of file
diff --git a/mail/changes/feature_4029-comply-with-rfc3159 b/mail/changes/feature_4029-comply-with-rfc3159
deleted file mode 100644
index c2c32afe..00000000
--- a/mail/changes/feature_4029-comply-with-rfc3159
+++ /dev/null
@@ -1 +0,0 @@
- o Comply with RFC 3156. Closes #4029.
diff --git a/mail/pkg/requirements.pip b/mail/pkg/requirements.pip
index 13d8b6a7..6fa0df47 100644
--- a/mail/pkg/requirements.pip
+++ b/mail/pkg/requirements.pip
@@ -1,4 +1,4 @@
leap.soledad.client>=0.3.0
leap.common>=0.3.0
-leap.keymanager>=0.3.0
+leap.keymanager>=0.3.4
twisted # >= 12.0.3 ??