summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-11-25 17:49:51 -0300
committerTomás Touceda <chiiph@leap.se>2013-11-25 17:49:51 -0300
commitf98ecbe55f24de8a549cdf2af028f13a38a95187 (patch)
treea3184021974c1111b2fb4c13d48f0bb275df8b72 /.gitattributes
parent2a41fe83b194f91c913dcb68905541302d47a40a (diff)
parent49af4eef1003f1d36f1dc0719b678334719768a2 (diff)
Merge remote-tracking branch 'drebs/bug/4589_fail-gracefully-when-failing-to-decrypt-incoming-messages' into develop
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions