Chase Sterling 7260c88571 Merge branch 'master' into partials-update ... Conflicts: realms/modules/wiki/views.py		2016-09-05 13:30:27 -04:00
..
config	woosh -> whoosh	2016-09-05 01:30:37 +02:00
lib	make imports absolute	2016-09-05 01:31:00 +02:00
modules	Merge branch 'master' into partials-update	2016-09-05 13:30:27 -04:00
static	Merge branch 'master' into partials-update	2016-09-05 13:30:27 -04:00
templates	Merge branch 'master' into oauth_redirect	2016-09-04 12:25:57 -04:00
__init__.py	Merge pull request #167 from gazpachoking/markdown-it	2016-09-05 13:23:14 -04:00
commands.py	merge last conflict	2016-09-05 09:37:59 +02:00
version.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