Armon Dadgar 337997ab04 Fixing merge conflict		2015-06-29 14:50:55 -07:00
..
backend.go	Fixing merge conflict	2015-06-29 14:50:55 -07:00
backend_test.go	Fixing merge conflict	2015-06-29 14:50:55 -07:00
cli.go	auth/ldap: move username into the path (to allow per-user revokation on the path)	2015-05-09 22:06:28 +02:00
path_config.go	Fixing merge conflict	2015-06-29 14:50:55 -07:00
path_groups.go	Fixing merge conflict	2015-06-29 14:50:55 -07:00
path_login.go	Fixing merge conflict	2015-06-29 14:50:55 -07:00