Merge lp:~lukasz-czyzykowski/twitbuntu/clean into lp:twitbuntu

Proposed by Łukasz Czyżykowski
Status: Merged
Approved by: Łukasz Czyżykowski
Approved revision: 24
Merged at revision: 24
Proposed branch: lp:~lukasz-czyzykowski/twitbuntu/clean
Merge into: lp:twitbuntu
Diff against target: 25 lines (+1/-11)
1 file modified
urls.py (+1/-11)
To merge this branch: bzr merge lp:~lukasz-czyzykowski/twitbuntu/clean
Reviewer Review Type Date Requested Status
Łukasz Czyżykowski Approve
Review via email: mp+34905@code.launchpad.net

Commit message

Small clean up.

To post a comment you must log in.
Revision history for this message
Łukasz Czyżykowski (lukasz-czyzykowski) wrote :

There are additional revisions which have not been approved in review. Please seek review and approval of these revisions as well.

Revision history for this message
Łukasz Czyżykowski (lukasz-czyzykowski) wrote :

Everything ok.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'urls.py'
--- urls.py 2009-09-02 14:04:07 +0000
+++ urls.py 2010-09-08 20:16:50 +0000
@@ -1,6 +1,5 @@
1from django.conf.urls.defaults import *1from django.conf.urls.defaults import patterns
22
3# Uncomment the next two lines to enable the admin:
4from django.contrib import admin3from django.contrib import admin
5admin.autodiscover()4admin.autodiscover()
65
@@ -10,13 +9,4 @@
10 (r'^accounts/logout/$', 'django.contrib.auth.views.logout'),9 (r'^accounts/logout/$', 'django.contrib.auth.views.logout'),
11 (r'^(?P<username>\w+)$', 'twitbuntu.app.views.user'),10 (r'^(?P<username>\w+)$', 'twitbuntu.app.views.user'),
12 (r'^site-admin/(.*)', admin.site.root),11 (r'^site-admin/(.*)', admin.site.root),
13 # Example:
14 # (r'^twitbuntu/', include('twitbuntu.foo.urls')),
15
16 # Uncomment the admin/doc line below and add 'django.contrib.admindocs'
17 # to INSTALLED_APPS to enable admin documentation:
18 # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
19
20 # Uncomment the next line to enable the admin:
21 # (r'^admin/(.*)', admin.site.root),
22)12)

Subscribers

People subscribed via source and target branches

to all changes: