Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/sentry/conf/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@
import os

from sentry.web.urls import urlpatterns as web_urlpatterns
from django.conf.urls.defaults import patterns, url, include
try:
from django.conf.urls import include, patterns, url
except ImportError:
# django < 1.5 compat
from django.conf.urls.defaults import include, patterns, url # NOQA
from django.contrib import admin
from django.views.defaults import page_not_found

Expand Down