@@ -24,8 +24,7 @@ from djangocommonsettings import *
SITE_ID = 2
ROOT_URLCONF = 'conservancy.urls'
FORCE_CANONICAL_HOSTNAME = "sfconservancy.org"
FORCE_CANONICAL_HOSTNAME = False if DEBUG else 'sfconservancy.org'
ALLOWED_HOSTS = [ 'www.sfconservancy.org', 'aspen.sfconservancy.org', 'sfconservancy.org', u'104.130.70.210' ]