summaryrefslogtreecommitdiff
path: root/cgi-bin
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2014-01-15 00:48:07 +0100
committerMichael Tänzer <neo@nhng.de>2014-01-15 00:48:07 +0100
commit2c4c29221f7efcaa98ff3150e8563b2616d143da (patch)
treeadc5f3491472a47c5d8ed2b6decf7de4a39b6035 /cgi-bin
parentb9e886be937d8b8cd4625739968186633d87c36f (diff)
parentf0f37eabcb2554f78900396248a05cdee1626975 (diff)
downloadcacert-devel-2c4c29221f7efcaa98ff3150e8563b2616d143da.tar.gz
cacert-devel-2c4c29221f7efcaa98ff3150e8563b2616d143da.tar.xz
cacert-devel-2c4c29221f7efcaa98ff3150e8563b2616d143da.zip
Merge branch 'release' into bug-1195bug-1195
Conflicts: includes/account.php pages/account/6.php Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'cgi-bin')
0 files changed, 0 insertions, 0 deletions