diff options
| author | Alexandre Bourget <alexandre.bourget@savoirfairelinux.com> | 2011-03-24 12:07:09 -0400 |
|---|---|---|
| committer | Alexandre Bourget <alexandre.bourget@savoirfairelinux.com> | 2011-03-24 12:07:09 -0400 |
| commit | 95e799d074de2e81914d513b4c331df1e738c00e (patch) | |
| tree | b3039037533610d8c86d82bb28f139d8a3777013 /docs/_static | |
| parent | 22d3253a26767501827d86b56db3a9b79bef6c4e (diff) | |
| parent | b596e1812627c359908759d7a8d83c339f08e385 (diff) | |
| download | pyramid-95e799d074de2e81914d513b4c331df1e738c00e.tar.gz pyramid-95e799d074de2e81914d513b4c331df1e738c00e.tar.bz2 pyramid-95e799d074de2e81914d513b4c331df1e738c00e.zip | |
Merge remote branch 'source/master'
Conflicts:
docs/narr/hooks.rst
Diffstat (limited to 'docs/_static')
| -rw-r--r-- | docs/_static/latex-note.png | bin | 1776 -> 3844 bytes |
| -rw-r--r-- | docs/_static/latex-warning.png | bin | 1351 -> 3542 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/docs/_static/latex-note.png b/docs/_static/latex-note.png Binary files differindex 7e1647837..95d00a973 100644 --- a/docs/_static/latex-note.png +++ b/docs/_static/latex-note.png diff --git a/docs/_static/latex-warning.png b/docs/_static/latex-warning.png Binary files differindex 747b24529..6707bc362 100644 --- a/docs/_static/latex-warning.png +++ b/docs/_static/latex-warning.png |
