diff options
| author | John Anderson <sontek@gmail.com> | 2015-02-07 11:14:24 -0800 |
|---|---|---|
| committer | John Anderson <sontek@gmail.com> | 2015-02-07 11:14:24 -0800 |
| commit | ce7c06a044756422ba3741614515940d2b230e28 (patch) | |
| tree | 3373caf57660f003ebeb8e8954d87cba885ab89a /docs/_themes/pylons/static/ssh:/gitadmin@kingdread.de | |
| parent | 03a0d79306b2846313df1983a721d5cccf4ec3ce (diff) | |
| parent | b17fa8b19da6e8272515588abbd2299f03bc2942 (diff) | |
| download | pyramid-ce7c06a044756422ba3741614515940d2b230e28.tar.gz pyramid-ce7c06a044756422ba3741614515940d2b230e28.tar.bz2 pyramid-ce7c06a044756422ba3741614515940d2b230e28.zip | |
Merge branch 'master' of https://github.com/Pylons/pyramid into allow_class_method_directly
Conflicts:
pyramid/compat.py
Diffstat (limited to 'docs/_themes/pylons/static/ssh:/gitadmin@kingdread.de')
| m--------- | docs/_themes | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/docs/_themes b/docs/_themes -Subproject 3bec9280a6cedb15e97e5899021aa8d723c2538 +Subproject b14bf8c2a0d95ae8e3d38d07ad3721370ae6f3f |