summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-21 14:55:24 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-21 14:55:24 -0300
commit96be9573319456869c76de59b59e309a75fd15a6 (patch)
treea13d2d75771e2e45ee07a94cf39c43083db20cbb /CHANGELOG
parent35bdd37d15732af2cf59636ecf6970f147fd3747 (diff)
parent410908917841bc2decbd4d00e04f75e2e6f1b88d (diff)
Merge remote-tracking branch 'drebs/feature/3487-split-soledad-into-common-client-and-server' into develop
Conflicts: src/leap/mail/imap/fetch.py src/leap/mail/imap/server.py
Diffstat (limited to 'CHANGELOG')
0 files changed, 0 insertions, 0 deletions