parent: e012af | patch | commitdiff
Chris McDonough
2014-04-08 ecb376a132034bd4ccfe1daa69d4828699e9028d
refs
author Chris McDonough <chrism@plope.com>
Tuesday, April 8, 2014 15:08 +0200
committer Chris McDonough <chrism@plope.com>
Tuesday, April 8, 2014 15:08 +0200
commitecb376a132034bd4ccfe1daa69d4828699e9028d
tree 912b74c4dc61370bb46487f5c52fc705c70e150e tree | zip | gz
parent e012af904feb15f20a134f22eaeeb61bd9d56cc8 view | diff
bcf18220be9c21ff4b1af50f45b90aadfa7820f5 view | diff 
fix merge conflict while merging master to 1.5 branch
12 files modified
237 ■■■■■ changed files
CHANGES.txt 6 ●●●●● diff | view | raw | blame | history
docs/quick_tour.rst 44 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/forms/tutorial/wikipage_addedit.pt 4 ●●●●● diff | view | raw | blame | history
docs/quick_tutorial/scaffolds.rst 8 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/authorization.rst 15 ●●●●● diff | view | raw | blame | history
pyramid/config/views.py 14 ●●●●● diff | view | raw | blame | history
pyramid/security.py 12 ●●●●● diff | view | raw | blame | history
pyramid/session.py 64 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_integration.py 42 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_session.py 25 ●●●●● diff | view | raw | blame | history
setup.py 1 ●●●●● diff | view | raw | blame | history
tox.ini 2 ●●●●● diff | view | raw | blame | history