summaryrefslogtreecommitdiffhomepage
path: root/sites/docs/conf.py
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-02-20 14:15:59 -0800
committerJeff Forcier <jeff@bitprophet.org>2017-02-20 14:15:59 -0800
commit6e054ed8a98cdb938c3423461d5e2ea450e543ad (patch)
tree56853dd2d8cba0a9d4dfceb4c99851ee96fdbd9c /sites/docs/conf.py
parent6c4a51c0538c745da8b489e185843e2c32259517 (diff)
parentacf0fbf1fd4ed69df19d78a1675f8c54b215ae83 (diff)
Merge branch '2.0' into 2.1
Diffstat (limited to 'sites/docs/conf.py')
0 files changed, 0 insertions, 0 deletions