diff options
| author | Kali Kaneko <kali@futeisha.org> | 2014-04-22 08:40:05 -0500 |
|---|---|---|
| committer | Kali Kaneko <kali@futeisha.org> | 2014-04-22 08:40:05 -0500 |
| commit | b0f3002e107adb9b4423ff2a38690fcaab6d8478 (patch) | |
| tree | e4d7523a6f0d7b668d6b29f44af180fb4e818160 | |
| parent | 42f53026d3bb8d67077dade8c280d87130dc09a5 (diff) | |
| parent | 2b6ed340fd0f2f84431082890857dd5e7de63831 (diff) | |
Merge tag '0.5.0' into debian
Tag leap.mx version 0.5.0
Conflicts:
pkg/requirements.pip
| -rw-r--r-- | CHANGELOG | 7 | ||||
| -rw-r--r-- | changes/VERSION_COMPAT | 1 | ||||
| -rw-r--r-- | changes/bug_4475_use-couch-document | 1 | ||||
| -rw-r--r-- | changes/bug_multiple_encodings | 1 | ||||
| -rw-r--r-- | pkg/requirements.pip | 6 |
5 files changed, 10 insertions, 6 deletions
@@ -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/VERSION_COMPAT b/changes/VERSION_COMPAT index 615578e..cc00ecf 100644 --- a/changes/VERSION_COMPAT +++ b/changes/VERSION_COMPAT @@ -8,4 +8,3 @@ # # BEGIN DEPENDENCY LIST ------------------------- # leap.foo.bar>=x.y.z -leap.soledad.common>=0.5 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 diff --git a/pkg/requirements.pip b/pkg/requirements.pip index f3f96ac..d20aa25 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -8,8 +8,8 @@ paisley>=0.3.1 # for the time being. couchdb -leap.common>=0.3.6.99 -leap.soledad.common>=0.4.99 -leap.keymanager>=0.3.7.99 +leap.common>=0.3.7 +leap.soledad.common>=0.5.0 +leap.keymanager>=0.3.8 chardet # we fallback to chardet if cchardet is not available, but it's preferred |