summaryrefslogtreecommitdiff
path: root/data/libnghttp2/_metadata/conflicts
AgeCommit message (Expand)Author
2018-12-16A number of updates to make transitioning from electra repo smootherSam Bingner