~netlandish/django-wiki

98ac560b8d7b4333e905fbddffaf529b52105384 — Benjamin Bach 8 years ago a1f64c5 + bb7f6d9
Merge pull request #570 from nehemiahjacob/patch-1

wiki.core doesn't have settings.py; In fact wiki.conf does
1 files changed, 1 insertions(+), 1 deletions(-)

M wiki/plugins/haystack/__init__.py
M wiki/plugins/haystack/__init__.py => wiki/plugins/haystack/__init__.py +1 -1
@@ 1,6 1,6 @@
from __future__ import absolute_import
from __future__ import unicode_literals
from wiki.core import settings
from wiki.conf import settings
from wiki.core import permissions
from wiki import models