Merge lp://staging/~dholbach/ubuntu-packaging-guide/new-sidebar into lp://staging/~l3on/ubuntu-packaging-guide/new-sidebar
Proposed by
Daniel Holbach
| Status: | Merged |
|---|---|
| Merged at revision: | 91 |
| Proposed branch: | lp://staging/~dholbach/ubuntu-packaging-guide/new-sidebar |
| Merge into: | lp://staging/~l3on/ubuntu-packaging-guide/new-sidebar |
| Diff against target: |
2380 lines (+100/-2053) 20 files modified
BORROWED-CODE (+0/-8) conf.py (+1/-1) debian/control (+46/-6) debian/copyright (+0/-45) debian/rules (+27/-7) debian/ubuntu-packaging-guide-epub.docs (+1/-0) debian/ubuntu-packaging-guide-html.doc-base (+3/-3) debian/ubuntu-packaging-guide-html.doc-base.single (+3/-6) debian/ubuntu-packaging-guide-html.docs (+2/-0) debian/ubuntu-packaging-guide-pdf.doc-base (+10/-0) debian/ubuntu-packaging-guide-pdf.docs (+1/-0) debian/ubuntu-packaging-guide.docs (+0/-4) themes/ubuntu/layout.html (+1/-32) themes/ubuntu/static/default.css_t (+0/-62) themes/ubuntu/static/jquery-1.6.1.min.js (+0/-18) themes/ubuntu/static/light-django-theme.css (+0/-1265) themes/ubuntu/static/newstyle.css (+0/-592) themes/ubuntu/theme.conf (+0/-1) ubuntu-packaging-guide/index.rst (+2/-0) ubuntu-packaging-guide/packaging-new-software.rst (+3/-3) |
| To merge this branch: | bzr merge lp://staging/~dholbach/ubuntu-packaging-guide/new-sidebar |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Leo Iannacone | Pending | ||
|
Review via email:
|
|||
Description of the change
Let me know if this works for you.
I tried to use the system jquery.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
