diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-04-25 15:20:10 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-04-25 15:20:10 -0700 |
| commit | 5c97c4a05cbc2c3c3515aec9913622470503eee7 (patch) | |
| tree | 2d3518ad0d4f5d45a9be4a1a89f71ef5cd1e066a /sites/docs/conf.py | |
| parent | 9fe9feacb85aa9cf8ad6a694b331208720723444 (diff) | |
| parent | 1163fd91e31f280d7b1c4857529fe8314c61fdd5 (diff) | |
Merge branch '1.15' into 1.16
Diffstat (limited to 'sites/docs/conf.py')
0 files changed, 0 insertions, 0 deletions