diff options
| author | Chris McDonough <chrism@plope.com> | 2010-11-27 21:40:59 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-11-27 21:40:59 -0500 |
| commit | 43eb02a0ad067ffe32bf69a351ca0dce3f5a216c (patch) | |
| tree | 67c136c2136ad6d016bc35d6b9a5de410d1e8740 /docs/_static | |
| parent | 87f4a7cb32c9e89c914925f5cf4262834a1dd6d6 (diff) | |
| parent | aa3306e314fc951b9ed9b007f2e9e9aff7ad05ea (diff) | |
| download | pyramid-43eb02a0ad067ffe32bf69a351ca0dce3f5a216c.tar.gz pyramid-43eb02a0ad067ffe32bf69a351ca0dce3f5a216c.tar.bz2 pyramid-43eb02a0ad067ffe32bf69a351ca0dce3f5a216c.zip | |
Merge branch 'master' into twophase
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 |
