Chase Sterling 2ce6c2d314 Merge branch 'master' into oauth_redirect ... # Conflicts: # realms/modules/auth/views.py		2016-09-04 12:25:57 -04:00
..
ldap	Merge branch 'master' into oauth_redirect	2016-09-04 12:25:57 -04:00
local	Merge branch 'master' into oauth_redirect	2016-09-04 12:25:57 -04:00
oauth	Merge branch 'master' into oauth_redirect	2016-09-04 12:25:57 -04:00
templates/auth	Make modules contain their own static files and templates	2016-08-15 23:06:05 -04:00
__init__.py	Fix some deprecation warnings with newer flask version	2016-07-14 17:59:08 -04:00
models.py	Fix some deprecation warnings with newer flask version	2016-07-14 17:59:08 -04:00
tests.py	add tests file to auth	2014-10-09 10:39:42 -05:00
views.py	Merge branch 'master' into oauth_redirect	2016-09-04 12:25:57 -04:00