parent: d07c3a | patch | commitdiff
Steve Piercy
2017-06-10 8cbd2355d45fa6b1d6495564d0c12f646b860803
refs
author Steve Piercy <web@stevepiercy.com>
Saturday, June 10, 2017 21:50 +0200
committer Steve Piercy <web@stevepiercy.com>
Saturday, June 10, 2017 21:50 +0200
commit8cbd2355d45fa6b1d6495564d0c12f646b860803
tree 80d9cbd2612597b454e13a64eb8a6f8e1641ef92 tree | zip | gz
parent d07c3a0e91a6f9d96e80c36e40470a83383a656c view | diff
a503511cf82ab1db8c66eb949eeb30da92dd621f view | diff 
Merge remote-tracking branch 'upstream/master'
19 files modified
67 ■■■■■ changed files
CHANGES.txt 4 ●●●●● diff | view | raw | blame | history
CONTRIBUTORS.txt 2 ●●●●● diff | view | raw | blame | history
docs/narr/install.rst 4 ●●●●● diff | view | raw | blame | history
docs/quick_tour/sqla_demo/sqla_demo/models/__init__.py 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/definingmodels.rst 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authentication/tutorial/models/__init__.py 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/models/__init__.py 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/models/__init__.py 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/installation/tutorial/models/__init__.py 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/__init__.py 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/models/__init__.py 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/tutorial/models/__init__.py 1 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/models/__init__.py 1 ●●●●● diff | view | raw | blame | history
pyramid/authentication.py 10 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/alchemy/+package+/models/__init__.py_tmpl 1 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/zodb/+package+/__init__.py 2 ●●●●● diff | view | raw | blame | history
pyramid/security.py 5 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_security.py 24 ●●●●● diff | view | raw | blame | history
pyramid/view.py 2 ●●●●● diff | view | raw | blame | history