summaryrefslogtreecommitdiffstats
path: root/usr/local/share
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2015-06-01 18:50:46 -0500
committerChris Buechler <cmb@pfsense.org>2015-06-01 18:50:46 -0500
commitb4576c903af27013ce79a64511a2059942a5b471 (patch)
treec36f6d52e589f2665ad8891021e4eb820a5dd507 /usr/local/share
parent78b0dd57d5fe73a896ef5eb73038371cf3c6f99b (diff)
downloadpfsense-b4576c903af27013ce79a64511a2059942a5b471.zip
pfsense-b4576c903af27013ce79a64511a2059942a5b471.tar.gz
really fix botched manual merge request. Ticket #4720
Diffstat (limited to 'usr/local/share')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud