diff options
| author | Atsushi Odagiri <aodagx@gmail.com> | 2010-11-27 15:08:31 +0900 |
|---|---|---|
| committer | Atsushi Odagiri <aodagx@gmail.com> | 2010-11-27 15:08:31 +0900 |
| commit | cd2f78c893ce6ae98004189a1a0a649fac96d033 (patch) | |
| tree | 5ab84f72e6bf0476d7d40841f3341aaf9a4e54a4 /docs/_static | |
| parent | ba32a8d0dcee7f3cef231e08ed60d52fbf60ed4f (diff) | |
| parent | 4d76ed6f46304d43a6b95da7a4d5388527bf6c1e (diff) | |
| download | pyramid-cd2f78c893ce6ae98004189a1a0a649fac96d033.tar.gz pyramid-cd2f78c893ce6ae98004189a1a0a649fac96d033.tar.bz2 pyramid-cd2f78c893ce6ae98004189a1a0a649fac96d033.zip | |
Merge remote branch 'remotes/upstream/master'
Diffstat (limited to 'docs/_static')
| -rw-r--r-- | docs/_static/pylons.png (renamed from docs/_static/pyramid.png) | bin | 4063 -> 4063 bytes |
| -rw-r--r-- | docs/_static/pylons_small.png | bin | 0 -> 4063 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/docs/_static/pyramid.png b/docs/_static/pylons.png Binary files differindex 53f83e4d0..53f83e4d0 100644 --- a/docs/_static/pyramid.png +++ b/docs/_static/pylons.png diff --git a/docs/_static/pylons_small.png b/docs/_static/pylons_small.png Binary files differnew file mode 100644 index 000000000..53f83e4d0 --- /dev/null +++ b/docs/_static/pylons_small.png |
