← Back to branch summary

~ubuntu-branches/ubuntu/trusty/horizon/trusty-proposed

« back to all changes in this revision

Viewing changes to openstack_dashboard/urls.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2013-12-05 14:39:15 UTC
  • mto: This revision was merged to the branch mainline in revision 61.
  • Revision ID: package-import@ubuntu.com-20131205143915-5u8q3kdxdw8e7maz
Tags: upstream-2014.1~b1
Import upstream version 2014.1~b1

Show diffs side-by-side

added added

removed removed

Lines of Context:
openstack_dashboard/urls.py
23
23
"""
24
24
 
25
25
from django.conf import settings  # noqa
26
 
from django.conf.urls.defaults import include  # noqa
27
 
from django.conf.urls.defaults import patterns  # noqa
28
 
from django.conf.urls.defaults import url  # noqa
 
26
from django.conf.urls import include  # noqa
 
27
from django.conf.urls import patterns  # noqa
29
28
from django.conf.urls.static import static  # noqa
 
29
from django.conf.urls import url  # noqa
30
30
from django.contrib.staticfiles.urls import staticfiles_urlpatterns  # noqa
31
31
 
32
32
import horizon