diff options
| author | Jef van Schendel <mail@jefvanschendel.nl> | 2012-03-06 00:31:34 +0100 |
|---|---|---|
| committer | Jef van Schendel <mail@jefvanschendel.nl> | 2012-03-06 00:31:34 +0100 |
| commit | fe53180359b03cfacfb45286fdc4c30cbfd9289f (patch) | |
| tree | b251f9f5af56296deb0bac8b5ada78c9db15d016 /docs/source/conf.py | |
| parent | 1213b8260ab4da97d465e7ef0e71fac2a2c20dbd (diff) | |
| parent | e58f2599659cd1f11d6d296bce7b84c6e1ddde6c (diff) | |
| download | mediagoblin-fe53180359b03cfacfb45286fdc4c30cbfd9289f.tar.lz mediagoblin-fe53180359b03cfacfb45286fdc4c30cbfd9289f.tar.xz mediagoblin-fe53180359b03cfacfb45286fdc4c30cbfd9289f.zip | |
Fix merge conflict in prev_next.html
Diffstat (limited to 'docs/source/conf.py')
0 files changed, 0 insertions, 0 deletions