diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2013-09-05 22:26:10 -0600 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2013-09-05 22:26:10 -0600 |
| commit | e8b1cf5dbb6353c0eead76996d1c002440bd6b89 (patch) | |
| tree | c33eb4eec81f288f48242ae1f272b0b896556518 /docs/tutorials/wiki2/basiclayout.rst | |
| parent | 89917f6e0323777bf8fa2c94ae81c7ebf6ad7a6d (diff) | |
| parent | 027c9809ca9377b3ae37a34e4ed997d8fdfddfb8 (diff) | |
| download | pyramid-e8b1cf5dbb6353c0eead76996d1c002440bd6b89.tar.gz pyramid-e8b1cf5dbb6353c0eead76996d1c002440bd6b89.tar.bz2 pyramid-e8b1cf5dbb6353c0eead76996d1c002440bd6b89.zip | |
Merge branch 'master' into feature/split_chameleon_from_pyramid
Conflicts:
pyramid/tests/test_renderers.py
Diffstat (limited to 'docs/tutorials/wiki2/basiclayout.rst')
0 files changed, 0 insertions, 0 deletions