diff options
| author | Steve Piercy <web@stevepiercy.com> | 2016-04-14 23:10:40 -0700 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2016-04-14 23:10:40 -0700 |
| commit | 642940cd29203e2e271f72dc866943f447d707e4 (patch) | |
| tree | 4441f87f10771e527ece86ee65103087836d6f73 /RELEASING.txt | |
| parent | caf65803b79fb05a570af39e5ed90bed7e51e942 (diff) | |
| parent | 3fc6e7fb89c2fcece39f448fd4e3a2c0c54b8439 (diff) | |
| download | pyramid-642940cd29203e2e271f72dc866943f447d707e4.tar.gz pyramid-642940cd29203e2e271f72dc866943f447d707e4.tar.bz2 pyramid-642940cd29203e2e271f72dc866943f447d707e4.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
docs/whatsnew-1.7.rst
Diffstat (limited to 'RELEASING.txt')
0 files changed, 0 insertions, 0 deletions