summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-12-19 11:41:50 -0300
committerTomás Touceda <chiiph@leap.se>2013-12-19 11:41:50 -0300
commitdf58fb83cf7278a9d2e2ddb278fa9a0b314e88bb (patch)
tree23823df37f5946b85405aff7fe657fe5f0a52ed7 /CHANGELOG
parentd7418f5b90b0731b28973c29d3b4ed3e9a0edaf4 (diff)
parent45f957d559940be343820c1b72674e0bfc2dbd62 (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 'CHANGELOG')
0 files changed, 0 insertions, 0 deletions