diff options
| author | Chris McDonough <chrism@plope.com> | 2013-08-17 17:21:50 +0200 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-08-17 17:21:50 +0200 |
| commit | 8b1007d402cd8fb1ea3a35c5ad1dbc6616919a56 (patch) | |
| tree | 6b5b9e7c388ba422811f2a7f06d217eec5f89352 /docs/conf.py | |
| parent | 2d66691349b5042a0316c3f051c3a6d7edddc4a1 (diff) | |
| parent | 796af58e3741a03cbddbaed19def5984fe8601e4 (diff) | |
| download | pyramid-8b1007d402cd8fb1ea3a35c5ad1dbc6616919a56.tar.gz pyramid-8b1007d402cd8fb1ea3a35c5ad1dbc6616919a56.tar.bz2 pyramid-8b1007d402cd8fb1ea3a35c5ad1dbc6616919a56.zip | |
Merge branch 'adroullier-master'
Diffstat (limited to 'docs/conf.py')
0 files changed, 0 insertions, 0 deletions