diff options
author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-08-07 11:57:12 -0500 |
---|---|---|
committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-08-07 11:57:12 -0500 |
commit | 24e6c34e880494f3e0cb2151db13ffcd128e1578 (patch) | |
tree | 6b59a3e1f245a181abffdff108ca9f05c177db4f /docs/source/siteadmin/relnotes.rst | |
parent | 31de493e4136f1c0c8e9d8f0b82c2914ea990c15 (diff) | |
parent | 99d79749c44f3cb37faf4152762f9847292b7c0a (diff) | |
download | mediagoblin-24e6c34e880494f3e0cb2151db13ffcd128e1578.tar.lz mediagoblin-24e6c34e880494f3e0cb2151db13ffcd128e1578.tar.xz mediagoblin-24e6c34e880494f3e0cb2151db13ffcd128e1578.zip |
Merge branch 'merge-pyconfigure'
Conflicts:
docs/source/siteadmin/deploying.rst
Diffstat (limited to 'docs/source/siteadmin/relnotes.rst')
0 files changed, 0 insertions, 0 deletions