Ivan Filippov 942ca47103 Merge remote-tracking branch 'upstream/master' into ldap_group_security ... Conflicts: app/models.py config_template.py		2016-04-13 09:56:46 -06:00
..
lib	Adjustment in application config	2016-04-13 11:13:59 +07:00
static	Add DNSSEC information into domain list. Adjustemnt in domain list table	2016-03-24 20:01:08 +07:00
templates	Don't show the LDAP authentication method in the login page if this feature isn't enabled	2016-04-13 11:33:07 +07:00
__init__.py	Add ProxyFix() middleware component to fix the HTTPS redirection issue. See !17	2016-04-10 21:23:27 +07:00
models.py	Merge remote-tracking branch 'upstream/master' into ldap_group_security	2016-04-13 09:56:46 -06:00
views.py	Don't show the LDAP authentication method in the login page if this feature isn't enabled	2016-04-13 11:33:07 +07:00