Chase Sterling 7260c88571 Merge branch 'master' into partials-update ... Conflicts: realms/modules/wiki/views.py		2016-09-05 13:30:27 -04:00
..
auth	merge last conflict	2016-09-05 09:37:59 +02:00
search	more readable imports	2016-09-05 01:30:37 +02:00
wiki	Merge branch 'master' into partials-update	2016-09-05 13:30:27 -04:00
__init__.py	systematic use of from __future__ import absolute_import. it eliminates import NAME confusion with very common names (eg. import ldap is very ambiguous: can be a ldap module from realms-wiki, a ldap module from flask-ldap-login, or python-ldap module.	2016-09-05 01:29:29 +02:00