688a63e Update history to reflect merge of #6878 [ci skip]

Authored and Committed by jekyllbot 6 years ago
file modified
+1 -0