summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2014-04-07 16:41:05 +0200
committerMichael Tänzer <neo@nhng.de>2014-04-07 16:41:05 +0200
commit58ed02255a13a05e44ba5e4d84ac94651ebf254f (patch)
tree7540deadf1853012dae7769002f7f0d7d864d16e /scripts
parent65cfb74c8f32ef368af8cdef1d03ab62c0076907 (diff)
parent9fac7480427d57ab70d5edbeb529640c430e381f (diff)
downloadcacert-devel-58ed02255a13a05e44ba5e4d84ac94651ebf254f.tar.gz
cacert-devel-58ed02255a13a05e44ba5e4d84ac94651ebf254f.tar.xz
cacert-devel-58ed02255a13a05e44ba5e4d84ac94651ebf254f.zip
Merge branch 'bug-1138' into testserver-stable
Conflicts: includes/account.php includes/notary.inc.php Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions