Skip to content
This repository was archived by the owner on May 20, 2022. It is now read-only.

Django 1.6 changed the import of url #11

Open
squarepegsys wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Django 1.6 changed the import of url #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion flatpages_tinymce/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@
from flatpages_tinymce import settings
from django.shortcuts import get_object_or_404
from django.http import HttpResponse, Http404
from django.conf.urls.defaults import patterns, url
try:
from django.conf.urls.defaults import patterns, url
except:
from django.conf.urls import patterns, url
from django.views.decorators.csrf import csrf_protect


Expand Down