summaryrefslogtreecommitdiff
path: root/mail/.gitattributes
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2014-10-07 16:09:46 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2014-10-07 16:09:46 -0300
commit075c4cb959f6dca059d64fc6fd7bc79765277d48 (patch)
treedf5b90a11e5d836d9044d4b67fd5387bf8035006 /mail/.gitattributes
parentb897ec2847f83e3f410eab27ba3c7b94bb818ce1 (diff)
parentee2e3a88e51c3e0fa01f34af02e1cf89aff1113c (diff)
Merge remote-tracking branch 'meskio/feature/keymanager_api' into develop
Diffstat (limited to 'mail/.gitattributes')
0 files changed, 0 insertions, 0 deletions