diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2017-02-19 11:39:34 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2017-02-19 11:39:34 -0800 |
| commit | e35519f934ef473d4077c69d2153d1bec4a064fd (patch) | |
| tree | 5c70f22d36ff01fca78150c924a8ca4e7ae2515f /sites/docs/conf.py | |
| parent | 37a93e29297880be17be42053196d9be40bcb88a (diff) | |
| parent | b43dfe13259f43e670b568764e23e5ea057154b4 (diff) | |
Merge branch '2.0' into 2.1
Diffstat (limited to 'sites/docs/conf.py')
0 files changed, 0 insertions, 0 deletions