diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2015-04-17 17:09:06 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2015-04-17 17:09:06 -0500 |
| commit | a35b7c7fb38f7121eacef7fc6a76b06db47fabf2 (patch) | |
| tree | 73176f4eb6af01e2f4de158a3371db794d5c619c /setup.py | |
| parent | 3ae2371242802ac58ce0ba13c02b911a5a16482e (diff) | |
| parent | 9fa1e602b40d1e531335bf903dc7b15632818cf0 (diff) | |
| download | mediagoblin-a35b7c7fb38f7121eacef7fc6a76b06db47fabf2.tar.lz mediagoblin-a35b7c7fb38f7121eacef7fc6a76b06db47fabf2.tar.xz mediagoblin-a35b7c7fb38f7121eacef7fc6a76b06db47fabf2.zip | |
Merge branch 'stable'
Conflicts:
docs/source/siteadmin/deploying.rst
docs/source/siteadmin/relnotes.rst
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions