Chris McDonough
2013-12-12 c4cd124e05b54c675dde63889b1cce50dd57d7f1
refs
author Chris McDonough <chrism@plope.com>
Thursday, December 12, 2013 22:06 +0100
committer Chris McDonough <chrism@plope.com>
Thursday, December 12, 2013 22:06 +0100
commitc4cd124e05b54c675dde63889b1cce50dd57d7f1
tree a88f829c5026e8c8821dd06a31c443af2bef4757 tree | zip | gz
parent 28c26c17d66b563140e60b95ca1ea7e6dc3ccb6c view | diff
2617e2198fac67364b195a12e228da20c3f8afee view | diff
Merge branch 'wichert-jsonp-syntax'
5 files modified
24 ■■■■■ changed files
CHANGES.txt 3 ●●●●● diff | view | raw | blame | history
docs/narr/commandline.rst 12 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/views.py 5 ●●●●● diff | view | raw | blame | history
pyramid/renderers.py 2 ●●● diff | view | raw | blame | history
pyramid/tests/test_renderers.py 2 ●●● diff | view | raw | blame | history