diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-12-12 15:42:02 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-12-12 15:42:02 -0800 |
| commit | 317fec31f9cff564c7e5ba769bc0a77c7ba861a7 (patch) | |
| tree | 06b2e5f9ba32e636f8b319984b6b7c9ca11c18b7 /sites/docs/conf.py | |
| parent | 5ec27afb96168bcf0f98f09e336aab88e3d62672 (diff) | |
| parent | e4273b3f236f279a15ced43e6ee707bfea80beb7 (diff) | |
Merge branch '2.0' into 2.1
Diffstat (limited to 'sites/docs/conf.py')
0 files changed, 0 insertions, 0 deletions