parent: 0fdb54 | patch | commitdiff
Chris McDonough
2013-06-20 56511b0defbc4437a1e1d3b013c504886270d01b
refs
author Chris McDonough <chrism@plope.com>
Thursday, June 20, 2013 22:07 +0200
committer Chris McDonough <chrism@plope.com>
Thursday, June 20, 2013 22:07 +0200
commit56511b0defbc4437a1e1d3b013c504886270d01b
tree 69ee1e9149329c00a830e0f677de0981735e48b9 tree | zip | gz
parent 0fdb540f8e432061ec09623f0275a6b6555292ef view | diff
9e6c8c66aaec13e5c4868f3101b2459f56c2e0c4 view | diff 
Merge branch 'master' of github.com:Pylons/pyramid
1 files added
21 files modified
1153 ■■■■■ changed files
.travis.yml 1 ●●●●● diff | view | raw | blame | history
CHANGES.txt 20 ●●●●● diff | view | raw | blame | history
CONTRIBUTORS.txt 2 ●●●●● diff | view | raw | blame | history
MANIFEST.in 726 ●●●●● diff | view | raw | blame | history
README.rst 4 ●●●●● diff | view | raw | blame | history
docs/designdefense.rst 2 ●●●●● diff | view | raw | blame | history
docs/narr/resources.rst 2 ●●●●● diff | view | raw | blame | history
docs/narr/sessions.rst 90 ●●●●● diff | view | raw | blame | history
pyramid/chameleon_text.py 3 ●●●●● diff | view | raw | blame | history
pyramid/chameleon_zpt.py 3 ●●●●● diff | view | raw | blame | history
pyramid/config/assets.py 38 ●●●●● diff | view | raw | blame | history
pyramid/interfaces.py 44 ●●●●● diff | view | raw | blame | history
pyramid/mako_templating.py 17 ●●●●● diff | view | raw | blame | history
pyramid/router.py 1 ●●●●● diff | view | raw | blame | history
pyramid/scripts/prequest.py 23 ●●●●● diff | view | raw | blame | history
pyramid/session.py 26 ●●●●● diff | view | raw | blame | history
pyramid/testing.py 2 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_assets.py 96 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_mako_templating.py 2 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_scripts/test_prequest.py 26 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_session.py 21 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_testing.py 4 ●●●●● diff | view | raw | blame | history