Michael Merickel
2017-04-30 9c15a8eac2848cc7a81f174ecf7a6c63be323f51
refs
author Michael Merickel <michael@merickel.org>
Sunday, April 30, 2017 09:02 +0200
committer Michael Merickel <michael@merickel.org>
Sunday, April 30, 2017 09:02 +0200
commit9c15a8eac2848cc7a81f174ecf7a6c63be323f51
tree abf20accdb77f6127a5480bf023231c7b0b6706b tree | zip | gz
parent 3f14d63c009ae7f101b7aeb4525bab2dfe66fa11 view | diff
87af11c5e33b8c03d57a8b571f0b152efe866af1 view | diff
Merge branch 'master' into pr/2854
39 files modified
173 ■■■■ changed files
CHANGES.txt 5 ●●●●● diff | view | raw | blame | history
CONTRIBUTORS.txt 2 ●●●●● diff | view | raw | blame | history
HISTORY.txt 6 ●●●●● diff | view | raw | blame | history
README.rst 8 ●●●● diff | view | raw | blame | history
docs/narr/logging.rst 2 ●●● diff | view | raw | blame | history
docs/narr/myproject/README.txt 2 ●●● diff | view | raw | blame | history
docs/narr/project.rst 2 ●●● diff | view | raw | blame | history
docs/quick_tour.rst 4 ●●●● diff | view | raw | blame | history
docs/quick_tour/logging/README.txt 2 ●●● diff | view | raw | blame | history
docs/quick_tour/package/README.txt 2 ●●● diff | view | raw | blame | history
docs/quick_tour/sessions/README.txt 2 ●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/README.txt 2 ●●● diff | view | raw | blame | history
docs/quick_tutorial/cookiecutters.rst 2 ●●● diff | view | raw | blame | history
docs/quick_tutorial/cookiecutters/README.txt 2 ●●● diff | view | raw | blame | history
docs/tutorials/modwsgi/index.rst 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki/installation.rst 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/README.txt 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/README.txt 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/installation/README.txt 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/README.txt 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/tests/README.txt 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/README.txt 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki2/installation.rst 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authentication/README.txt 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authentication/tutorial/views/default.py 6 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/README.txt 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/views/default.py 6 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/README.txt 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/README.txt 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/README.txt 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/README.txt 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/tutorial/views/default.py 6 ●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/README.txt 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/views/default.py 6 ●●●● diff | view | raw | blame | history
docs/whatsnew-1.8.rst 7 ●●●●● diff | view | raw | blame | history
pyramid/config/__init__.py 40 ●●●●● diff | view | raw | blame | history
pyramid/config/security.py 7 ●●●● diff | view | raw | blame | history
pyramid/config/views.py 4 ●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_init.py 16 ●●●●● diff | view | raw | blame | history