diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-08-25 22:08:47 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-08-25 22:08:47 -0700 |
| commit | 8b2b9450b444bcc739d199977fcf5684e0cfe6bc (patch) | |
| tree | ad6d3167329819187e8d9723754ac41324e09966 /LICENSE | |
| parent | fd1e162243898e34545ef5c1985bedee16174981 (diff) | |
| parent | ce1ec358abbd1726f39df9b19d6e4e681819abb9 (diff) | |
Merge branch '1.14'
Conflicts:
sites/www/changelog.rst
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions