summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2015-01-22 00:02:17 +0100
committerBenny Baumann <BenBE@geshi.org>2015-01-22 00:02:17 +0100
commitfa68e3ded553ffb0e5808044c457b13c6d6e4d51 (patch)
tree5d5153829bfffca2e92f38661aacf1d2251fa25a /README.md
parentd2965b141a3ae891b97a086269759bc94bd4bca6 (diff)
parent7fd0b20438735aea8206d27517cd72d8bb2310cd (diff)
downloadcacert-devel-fa68e3ded553ffb0e5808044c457b13c6d6e4d51.tar.gz
cacert-devel-fa68e3ded553ffb0e5808044c457b13c6d6e4d51.tar.xz
cacert-devel-fa68e3ded553ffb0e5808044c457b13c6d6e4d51.zip
Merge branch 'bug-1253' into testserver-stable
Conflicts: includes/tverify_stuff.php pages/account/40.php pages/index/1.php pages/index/11.php
Diffstat (limited to 'README.md')
0 files changed, 0 insertions, 0 deletions