diff options
| author | Chris McDonough <chrism@plope.com> | 2013-09-05 23:59:45 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-09-05 23:59:45 -0400 |
| commit | 027c9809ca9377b3ae37a34e4ed997d8fdfddfb8 (patch) | |
| tree | 4682cd488b8c78df6d4b4822e8af8499d6d4b5ac /docs/tutorials/wiki2 | |
| parent | ef5596c5e3de01afd1405e87f06de1f9867b4c86 (diff) | |
| parent | 3803d92fc0da5282656d4229e063a1908ec5522a (diff) | |
| download | pyramid-027c9809ca9377b3ae37a34e4ed997d8fdfddfb8.tar.gz pyramid-027c9809ca9377b3ae37a34e4ed997d8fdfddfb8.tar.bz2 pyramid-027c9809ca9377b3ae37a34e4ed997d8fdfddfb8.zip | |
resolve conflicts, reword change entry a bit
Diffstat (limited to 'docs/tutorials/wiki2')
0 files changed, 0 insertions, 0 deletions