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

..

__init__.py

added tests for no_auth feature

2013-05-24 16:52:48 -07:00

authentication_disabled_appconfig.ini

use new in-memory db for testing

2013-08-16 10:28:49 -07:00

ldap_appconfig.ini

added tests for ldap plugin

2013-08-15 16:02:00 -07:00

openid_appconfig.ini

use new in-memory db for testing

2013-08-16 10:28:49 -07:00

persona_appconfig.ini

merge --squash persona branch to take care of a false merge commit in

2013-07-03 15:07:39 -05:00