summaryrefslogtreecommitdiffhomepage
path: root/sites/www/index.rst
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-12-05 11:58:45 -0800
committerJeff Forcier <jeff@bitprophet.org>2016-12-05 11:58:45 -0800
commit892814e0faac85ccedc0d88b74c8ce83911f7300 (patch)
treefc6c17458a2928c85577b6a415a35dbf77cde9c7 /sites/www/index.rst
parent9183547b91cc5552b73f6b9565107df6fa5ab59b (diff)
parentf1ef287013d4c2bedc25ae29915b53ac1f63b482 (diff)
Merge branch '1.15' into 1.16
Diffstat (limited to 'sites/www/index.rst')
0 files changed, 0 insertions, 0 deletions