summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2014-03-21 17:15:23 +0100
committerMichael Tänzer <neo@nhng.de>2014-03-21 17:15:23 +0100
commitecd7c1033d881d51b54926075cfca3e9cd19a34d (patch)
tree7d0a758596fea01d772b302ceb5020bdf8e778df /scripts
parent56f0ddf35014a7c6384b09f386c3b84f3b59b183 (diff)
parentcff982918cd654ab9028ecc10b1ea3b2592ad9be (diff)
downloadcacert-devel-ecd7c1033d881d51b54926075cfca3e9cd19a34d.tar.gz
cacert-devel-ecd7c1033d881d51b54926075cfca3e9cd19a34d.tar.xz
cacert-devel-ecd7c1033d881d51b54926075cfca3e9cd19a34d.zip
Merge branch 'bug-1221' into testserver-stable
Conflicts: www/wot.php Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions