summaryrefslogtreecommitdiff
path: root/src/catlfish_sup.erl
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordberg.se>2014-10-24 11:07:19 +0200
committerLinus Nordberg <linus@nordberg.se>2014-10-24 11:07:19 +0200
commit53d252b808a62b2470a28c24a94266c67cae1ecc (patch)
tree2977175038b0d3f31e7aa029e0137b411eb8f064 /src/catlfish_sup.erl
parent5aa3ec1345e15c74efc2f08a146eeb412550d428 (diff)
parentf0b40ee24cb2e95f3ce1a7d06473459f3de2b7d5 (diff)
Merge branch 'validate-certchain' into staging1
Conflicts: src/catlfish.erl
Diffstat (limited to 'src/catlfish_sup.erl')
0 files changed, 0 insertions, 0 deletions