Resolve merge conflict and merge.
[mediagoblin.git] / docs / source / plugindocs / basic_auth.rst
1 .. include:: ../../../mediagoblin/plugins/basic_auth/README.rst
2