Christopher Allan Webber d33a954cad Merge remote-tracking branch 'refs/remotes/rodney757/new_ldap' ...

Conflicts:
	docs/source/index.rst
	mediagoblin/templates/mediagoblin/auth/login.html

2013-09-20 07:32:52 -05:00

..

basic_auth.rst

basic_auth documentation

2013-07-09 12:31:01 -07:00

flatpagesfile.rst

Finish flatpagesplugin; add plugin docs

2012-07-16 09:26:28 -04:00

ldap.rst

added docs for ldap plugin

2013-08-15 16:01:22 -07:00

oauth.rst

Added documentation for the OAuth plugin

2012-09-18 21:42:10 +02:00

openid.rst

added openid docs

2013-07-09 12:34:13 -07:00

persona.rst

added docs for the persona plugin

2013-07-09 13:31:32 -07:00

raven.rst

Fix sphinx warnsing in docs.

2013-03-17 17:39:31 -07:00

sampleplugin.rst

Finish flatpagesplugin; add plugin docs

2012-07-16 09:26:28 -04:00

trim_whitespace.rst

Don't require webob as dependency

2012-12-21 08:24:28 +01:00