diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-03-13 21:36:05 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-03-13 21:36:05 -0700 |
| commit | 005cfb8b251b79e5509e83c86f6ae4812aeebf7d (patch) | |
| tree | e04e22c595a3c2b3f908e83c76fe13bdc29d27d0 /sites/www/conf.py | |
| parent | bbd9469d65b93285a05388246ec45e9fc36ca732 (diff) | |
| parent | 4e9efe48306d885281af69559a8da2194741c139 (diff) | |
Merge branch '1.11' into 1.12
Conflicts:
sites/www/changelog.rst
Diffstat (limited to 'sites/www/conf.py')
0 files changed, 0 insertions, 0 deletions