diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-12-17 15:05:12 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-12-17 15:05:12 -0800 |
| commit | 1ad893aa91512cfa4fc3b0309ca9be62f6afd627 (patch) | |
| tree | ba6e22a7e4a5a143ada58e2a9230c15861998f45 /sites/www/_templates | |
| parent | e07dbc9cd7dcf6ebaa9315ad9d4a44eb5ed20e5b (diff) | |
| parent | 0de4b781ddc3aa749548560da78bc39c59cb2ef0 (diff) | |
Merge branch '1.14' into 1.15
Conflicts:
sites/www/changelog.rst
Diffstat (limited to 'sites/www/_templates')
0 files changed, 0 insertions, 0 deletions