diff options
| author | Steve Piercy <web@stevepiercy.com> | 2016-03-27 06:05:35 -0700 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2016-03-27 06:05:35 -0700 |
| commit | c17ae8be8e2a7308ad8b994df22a8a2cbe9686db (patch) | |
| tree | cc74ef7c7650906dc60d079e8d7fa7f78084da96 /setup.py | |
| parent | 05d5607076cd80d41c99ba3c8c0276d2ecaaa69c (diff) | |
| parent | cc396a8b8d7746f4bf0372a003d056427f6d82a0 (diff) | |
| download | pyramid-c17ae8be8e2a7308ad8b994df22a8a2cbe9686db.tar.gz pyramid-c17ae8be8e2a7308ad8b994df22a8a2cbe9686db.tar.bz2 pyramid-c17ae8be8e2a7308ad8b994df22a8a2cbe9686db.zip | |
Merge pull request #2415 from stevepiercy/master
attempt to clean out results of merges
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions