summaryrefslogtreecommitdiff
path: root/client/src/leap/soledad
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-03-11 09:56:28 -0300
committerTomás Touceda <chiiph@leap.se>2014-03-11 09:56:28 -0300
commita8d002714e4ce2ff487785357cc01d082ffad537 (patch)
tree00bb495df23d7f826bebe85fb500501ca8f460b3 /client/src/leap/soledad
parent66c93f4515139fcf666948b31e09c5bfae91e3dc (diff)
parente5664fb1046e71589d0c41cd605761cc642ff28b (diff)
Merge remote-tracking branch 'refs/remotes/drebs/feature/5011_use-less-memory-when-putting-docs-on-couch-3' into develop
Diffstat (limited to 'client/src/leap/soledad')
-rw-r--r--client/src/leap/soledad/client/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/src/leap/soledad/client/__init__.py b/client/src/leap/soledad/client/__init__.py
index b5ce7c32..a8d68c88 100644
--- a/client/src/leap/soledad/client/__init__.py
+++ b/client/src/leap/soledad/client/__init__.py
@@ -778,7 +778,7 @@ class Soledad(object):
============================== WARNING ==============================
This method converts the document's contents to unicode in-place. This
- meanse that after calling C{put_doc(doc)}, the contents of the
+ means that after calling C{put_doc(doc)}, the contents of the
document, i.e. C{doc.content}, might be different from before the
call.
============================== WARNING ==============================