diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-12-19 11:41:50 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-12-19 11:41:50 -0300 |
| commit | df58fb83cf7278a9d2e2ddb278fa9a0b314e88bb (patch) | |
| tree | 23823df37f5946b85405aff7fe657fe5f0a52ed7 /changes | |
| parent | d7418f5b90b0731b28973c29d3b4ed3e9a0edaf4 (diff) | |
| parent | 45f957d559940be343820c1b72674e0bfc2dbd62 (diff) | |
Merge remote-tracking branch 'refs/remotes/drebs/bug/4475_use-couch-document' into develop
Conflicts:
src/leap/mx/mail_receiver.py
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/VERSION_COMPAT | 1 | ||||
| -rw-r--r-- | changes/bug_4475_use-couch-document | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/changes/VERSION_COMPAT b/changes/VERSION_COMPAT index cc00ecf..615578e 100644 --- a/changes/VERSION_COMPAT +++ b/changes/VERSION_COMPAT @@ -8,3 +8,4 @@ # # 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 new file mode 100644 index 0000000..54c6897 --- /dev/null +++ b/changes/bug_4475_use-couch-document @@ -0,0 +1 @@ + o Use CouchDocument to comply with new Soledad couch backend (#4475). |