# include settimgs from daiquiri
from daiquiri.core.settings.django import *
from daiquiri.core.settings.celery import *
from daiquiri.core.settings.daiquiri import *
from daiquiri.core.settings.logging import *
from daiquiri.core.settings.vendor import *

from daiquiri.archive.settings import *
from daiquiri.auth.settings import *
from daiquiri.conesearch.settings import *
from daiquiri.cutout.settings import *
from daiquiri.files.settings import *
from daiquiri.meetings.settings import *
from daiquiri.metadata.settings import *
from daiquiri.oai.settings import *
from daiquiri.query.settings import *
from daiquiri.serve.settings import *
from daiquiri.stats.settings import *
from daiquiri.tap.settings import *
from daiquiri.wordpress.settings import *

# override settings from base.py (which is checked in to git)
try:
    from .base import *
except ImportError:
    pass

# override settings from local.py (which is not checked in to git)
try:
    from .local import *
except ImportError:
    pass

@@ -595,32 +595,73 @@
 ttings import *%0A
+from daiquiri.registry.settings import *%0A
 from daiquiri.se

Add registry settings to testing