diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-08-25 22:08:26 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-08-25 22:08:26 -0700 |
| commit | ce1ec358abbd1726f39df9b19d6e4e681819abb9 (patch) | |
| tree | c424bdf57935a896caf72f1fe029f39483e8d926 /sites/www/conf.py | |
| parent | 951faed80b017e553a27c4cb98f210df44341f8f (diff) | |
| parent | d05ca17db876055a5f584e720b1b0733116b4365 (diff) | |
Merge branch '1.13' into 1.14
Conflicts:
sites/www/changelog.rst
Diffstat (limited to 'sites/www/conf.py')
0 files changed, 0 insertions, 0 deletions