LoCo Team Portal

Merge lp:~cjohnston/loco-team-portal/theme-update-50 into lp:loco-team-portal

  1. theme-update-50
  2. Merge into 0.2
Proposed by Chris Johnston
Status: Merged
Approved by: Adnane Belmadiaf
Approved revision: 595
Merged at revision: 590
Proposed branch: lp:~cjohnston/loco-team-portal/theme-update-50
Merge into: lp:loco-team-portal
Diff against target: 16 lines (+2/-2)
1 file modified
loco_directory/settings.py (+2/-2)
To merge this branch: bzr merge lp:~cjohnston/loco-team-portal/theme-update-50
Reviewer Review Type Date Requested Status
LoCo Team Portal Developers Pending
Review via email: mp+141294@code.launchpad.net

Commit message

Updates LTP to use revno 50 of light-django-theme

To post a comment you must log in.
lp:~cjohnston/loco-team-portal/theme-update-50 updated
595. By Chris Johnston

Removes unneeded debugging code

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loco_directory/settings.py'
2--- loco_directory/settings.py 2012-12-26 17:23:50 +0000
3+++ loco_directory/settings.py 2012-12-26 21:35:25 +0000
4@@ -208,10 +208,10 @@
5
6 BZR_APPS = {
7 ## ubuntu-django-foundations app management
8- 'bzr_apps': ('bzr+ssh://bazaar.launchpad.net/%2Bbranch/ubuntu-django-foundations/bzr-apps/', '7'),
9+ 'bzr_apps': ('bzr+ssh://bazaar.launchpad.net/%2Bbranch/ubuntu-django-foundations/bzr-apps/', '8'),
10
11 ## ubuntu-website supplied templates and styles
12- 'ubuntu_website': ('bzr+ssh://bazaar.launchpad.net/~ubuntu-community-webthemes/ubuntu-community-webthemes/light-django-theme', '45'),
13+ 'ubuntu_website': ('bzr+ssh://bazaar.launchpad.net/~ubuntu-community-webthemes/ubuntu-community-webthemes/light-django-theme', '50'),
14
15 ## twidenash supplied microblog embedding javascript
16 'media/js/twidenash': ('bzr+ssh://bazaar.launchpad.net/~django-foundations-dev/twidenash/2.0/', '4'),

Subscribers

People subscribed via source and target branches