Summit

Merge lp:~cjohnston/summit/I-hate-404 into lp:summit

  1. I-hate-404
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Adnane Belmadiaf
Approved revision: 494
Merged at revision: 495
Proposed branch: lp:~cjohnston/summit/I-hate-404
Merge into: lp:summit
Diff against target: 12 lines (+1/-1)
1 file modified
summit/settings.py (+1/-1)
To merge this branch: bzr merge lp:~cjohnston/summit/I-hate-404
Reviewer Review Type Date Requested Status
Adnane Belmadiaf Approve
Review via email: mp+151322@code.launchpad.net

Commit message

Fixes 404

To post a comment you must log in.
Revision history for this message
Adnane Belmadiaf (daker) wrote :

+1 from me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/settings.py'
2--- summit/settings.py 2013-02-26 23:49:11 +0000
3+++ summit/settings.py 2013-03-01 22:16:24 +0000
4@@ -181,7 +181,7 @@
5 'bzr_apps': ('http://bazaar.launchpad.net/~django-foundations-dev/ubuntu-django-foundations/bzr_apps', '7'),
6
7 ## ubuntu-website supplied templates and styles
8- 'ubuntu_website': ('http://bazaar.launchpad.net/~ubuntu-community-webthemes/ubuntu-community-webthemes/light-django-theme', '54'),
9+ 'ubuntu_website': ('http://bazaar.launchpad.net/~ubuntu-community-webthemes/ubuntu-community-webthemes/light-django-theme', '55'),
10
11 ## linaro-website supplied templates and styles
12 'linaro_website': ('http://bazaar.launchpad.net/~linaro-connect-theme-devs/ubuntu-community-webthemes/light-django-linaro-theme', '52'),

Subscribers

People subscribed via source and target branches