heckyel/mediagoblin
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge remote-tracking branch 'refs/remotes/rodney757/new_ldap'

Browse Source 
Conflicts:
	docs/source/index.rst
	mediagoblin/templates/mediagoblin/auth/login.html
This commit is contained in:
Christopher Allan Webber
2013-09-20 07:32:52 -05:00
parent 81008d25a2 b1ac679592
commit d33a954cad
10 changed files with 511 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/source/index.rst
View File

@@ -61,6 +61,7 @@ Part 2: Core plugin documentation
plugindocs/basic_auth
plugindocs/openid
plugindocs/persona
plugindocs/ldap
Part 3: Plugin Writer's Guide

2
docs/source/plugindocs/ldap.rst Normal file
View File

@@ -0,0 +1,2 @@
.. include:: ../../../mediagoblin/plugins/ldap/README.rst