parent: 88d40c | patch | commitdiff
Chris McDonough
2016-07-01 d350714a917b1a06dd4be6092e7b3da64771a4af
refs
author Chris McDonough <chrism@plope.com>
Friday, July 1, 2016 01:41 +0200
committer Chris McDonough <chrism@plope.com>
Friday, July 1, 2016 01:41 +0200
commitd350714a917b1a06dd4be6092e7b3da64771a4af
tree 80c26cdd036093d312c2017c85eb05f94f19692c tree | zip | gz
parent 88d40ca6a84920d4c36b7a3be1cf3b46a6375f4e view | diff
bcba92d1b23745d736bdcbc9b799929de382db7b view | diff 
Merge branch 'master' of github.com:Pylons/pyramid
19 files modified
155 ■■■■■ changed files
CONTRIBUTORS.txt 4 ●●●●● diff | view | raw | blame | history
README.rst 31 ●●●●● diff | view | raw | blame | history
contributing.md 44 ●●●●● diff | view | raw | blame | history
docs/designdefense.rst 2 ●●●●● diff | view | raw | blame | history
docs/narr/security.rst 8 ●●●●● diff | view | raw | blame | history
docs/narr/urldispatch.rst 2 ●●●●● diff | view | raw | blame | history
docs/quick_tour.rst 30 ●●●●● diff | view | raw | blame | history
docs/quick_tour/json/hello_world.jinja2 2 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo/models/__init__.py 2 ●●●●● diff | view | raw | blame | history
docs/quick_tour/static_assets/hello_world.jinja2 2 ●●●●● diff | view | raw | blame | history
docs/quick_tour/static_assets/hello_world_static.jinja2 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authentication/tutorial/models/__init__.py 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/models/__init__.py 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/models/__init__.py 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/tutorial/models/__init__.py 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/models/__init__.py 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/tutorial/models/__init__.py 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/models/__init__.py 4 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/alchemy/+package+/models/__init__.py_tmpl 2 ●●●●● diff | view | raw | blame | history