Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Adrián Ribao
Cartero
Commits
94714495
Commit
94714495
authored
Mar 19, 2014
by
Adrián Ribao
Browse files
fix urls import for django 1.6
parent
ff5d5c9d
Changes
1
Hide whitespace changes
Inline
Side-by-side
cartero/admin.py
View file @
94714495
...
...
@@ -2,10 +2,10 @@
#from django.contrib.gis import admin
from
django.contrib
import
admin
#from mptt.admin import MPTTModelAdmin
from
django.utils.translation
import
ugettext_lazy
as
_
from
django.utils.translation
import
ugettext_lazy
as
_
from
cartero.models
import
Contact
,
EmailTemplate
,
Campaign
,
ExcludedEmail
,
\
ShortURL
,
LinkClick
,
OpenEmail
,
Image
from
django.conf.urls
.defaults
import
patterns
,
include
,
url
from
django.conf.urls
import
patterns
,
include
,
url
from
cartero.views
import
CreateTemplateView
,
UpdateTemplateView
from
cartero.utils.sending
import
CampaignDeliver
from
django.db.models
import
Count
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment