Chase Sterling 2ce6c2d314 Merge branch 'master' into oauth_redirect ... # Conflicts: # realms/modules/auth/views.py		2016-09-04 12:25:57 -04:00
..
errors	Add ability for 404 page to show error description.	2016-07-07 02:50:45 -04:00
layout.html	Merge branch 'master' into oauth_redirect	2016-09-04 12:25:57 -04:00
macros.html	WIP	2014-08-30 10:06:12 -05:00