Merge lp:~brett-alton-deactivatedaccount/quickshot/website into lp:~quickshotdevs/quickshot/website
Proposed by
Brett Alton
Status: | Merged |
---|---|
Approved by: | Brett Alton |
Approved revision: | 6 |
Merge reported by: | Adnane Belmadiaf |
Merged at revision: | not available |
Proposed branch: | lp:~brett-alton-deactivatedaccount/quickshot/website |
Merge into: | lp:~quickshotdevs/quickshot/website |
Diff against target: |
266 lines (+106/-39) 6 files modified
media/css/styles.css (+24/-5) sitemap.py (+1/-1) templates/base.html (+5/-5) templates/contact.html (+46/-22) templates/install.html (+25/-1) views.py (+5/-5) |
To merge this branch: | bzr merge lp:~brett-alton-deactivatedaccount/quickshot/website |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Brett Alton (community) | Approve | ||
Review via email:
|
Description of the change
Accidentally put under my own branch. Please merge and I will develop under the proper branch from now on.
To post a comment you must log in.
Merged!!