aboutsummaryrefslogtreecommitdiffstats
path: root/docs/source/siteadmin/deploying.rst
diff options
context:
space:
mode:
authorRodney Ewing <ewing.rj@gmail.com>2013-07-31 15:27:22 -0700
committerRodney Ewing <ewing.rj@gmail.com>2013-07-31 15:27:22 -0700
commit2119ee3b90446264db48f5259d8cce30e397dee3 (patch)
tree8d0c231ab2fac0c98b1b7848ce8e0ecda20292c9 /docs/source/siteadmin/deploying.rst
parent9b60486894e437b90592ec5354f76d7c40ffd6b6 (diff)
parent5058cd51000a5ed3093816b6f786aed7126a15ba (diff)
downloadmediagoblin-2119ee3b90446264db48f5259d8cce30e397dee3.tar.lz
mediagoblin-2119ee3b90446264db48f5259d8cce30e397dee3.tar.xz
mediagoblin-2119ee3b90446264db48f5259d8cce30e397dee3.zip
Merge commit 'refs/merge-requests/55' of git://gitorious.org/mediagoblin/mediagoblin into 55
Conflicts: docs/source/siteadmin/relnotes.rst
Diffstat (limited to 'docs/source/siteadmin/deploying.rst')
0 files changed, 0 insertions, 0 deletions