summaryrefslogtreecommitdiff
path: root/offlineimap.py
diff options
context:
space:
mode:
authorUrbain Vaes <urbain@vaes.uk>2015-03-30 12:12:49 +0100
committerUrbain Vaes <urbain@vaes.uk>2015-03-30 12:12:49 +0100
commit9a2ebe8e34e8be613da5e975b8a76e3b8ae7e215 (patch)
tree612db282ca020914bfcc087638766abf83b1e8ab /offlineimap.py
parentb7e66c07bc4d99f03c542a77ee5e7aa353dd16c3 (diff)
parent6fb28bc4b38947281908917b9230e78692674fdc (diff)
resolved merge conflicts
Diffstat (limited to 'offlineimap.py')
0 files changed, 0 insertions, 0 deletions