diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-12-18 13:58:10 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-12-18 13:58:10 -0800 |
| commit | 6a3630dd638abafbb7befa52c59001a0d0ae49e9 (patch) | |
| tree | 66faeafb0d4182315beb7a672495125231d37dba /tasks.py | |
| parent | b09d6c0612e8601fb39e4bdb1e6cc45f574ba6f6 (diff) | |
| parent | b3732cde6f2bea22fbbfd7ec6124489f61e502b7 (diff) | |
Merge branch '1.14' into 1.15
Conflicts:
sites/www/changelog.rst
Diffstat (limited to 'tasks.py')
0 files changed, 0 insertions, 0 deletions