Merge lp://qastaging/~ronnie.vd.c/erato/art-design-website into lp://qastaging/erato

Proposed by Ronnie
Status: Merged
Merged at revision: 7
Proposed branch: lp://qastaging/~ronnie.vd.c/erato/art-design-website
Merge into: lp://qastaging/erato
Diff against target: 57 lines (+3/-19)
4 files modified
.bzrignore (+1/-1)
AUTHORS (+1/-1)
art_website/common/launchpad.py (+0/-16)
art_website/urls.py (+1/-1)
To merge this branch: bzr merge lp://qastaging/~ronnie.vd.c/erato/art-design-website
Reviewer Review Type Date Requested Status
Martin Owens Approve
Review via email: mp+38989@code.qastaging.launchpad.net

Description of the change

Fixed static file serve dir because dit has moved

To post a comment you must log in.
8. By Ronnie

Changed my email, removed some unnecessary functions in launchpad.py and changed the static_media url

Revision history for this message
Martin Owens (doctormo) wrote :

Great updates, merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches