Nathaniel Guse b5651c0289 Merge remote-tracking branch 'remotes/Hardolaf/ticket/11626' into develop ... # By Joseph Warner # Via Joseph Warner * remotes/Hardolaf/ticket/11626: [ticket/11626] Remove last reference to template in ldap [ticket/11626] Remove LDAP dependency on template [ticket/11626] Make identifier uppercase per style requirements [ticket/11626] Change the identifier template file in the template [ticket/11626] Call method only one time per provider [ticket/11626] Change interface to match functionality [ticket/11626] Include the template file in acp_board [ticket/11626] LDAP Auth ACP Template File [ticket/11626] Create get_acp_template method for auth providers		2013-07-12 14:59:43 -05:00
..
images	Merge branch 'develop-olympus' into develop	2012-07-01 00:20:04 +02:00
style	Merge remote-tracking branch 'remotes/Hardolaf/ticket/11626' into develop	2013-07-12 14:59:43 -05:00
index.php	[ticket/11549] Do not set extension dir path for style in adm/index.php	2013-05-31 00:18:39 +02:00
swatch.php	Merge PR #1130 branch 'EXreaction/ticket/11259' into develop	2012-12-29 13:45:40 -05:00