Merge commit 'refs/merge-requests/55' of git://gitorious.org/mediagoblin/mediagoblin into 55

Conflicts:
	docs/source/siteadmin/relnotes.rst
This commit is contained in:
Rodney Ewing 2013-07-31 15:27:22 -07:00
commit 2119ee3b90
3 changed files with 3 additions and 4 deletions

View File

@ -2,7 +2,7 @@
# #
# You can set these variables from the command line. # You can set these variables from the command line.
SPHINXOPTS = SPHINXOPTS = -W
SPHINXBUILD = sphinx-build SPHINXBUILD = sphinx-build
PAPER = PAPER =
BUILDDIR = build BUILDDIR = build

View File

@ -1,2 +1 @@
.. _raven-setup: Set up the raven plugin
.. include:: ../../../mediagoblin/plugins/raven/README.rst .. include:: ../../../mediagoblin/plugins/raven/README.rst