Merge lp://qastaging/~james-page/horizon/icehouse-rc1 into lp://qastaging/~ubuntu-server-dev/horizon/icehouse
Proposed by
James Page
| Status: | Merged |
|---|---|
| Approved by: | Chuck Short |
| Approved revision: | 192 |
| Merged at revision: | 191 |
| Proposed branch: | lp://qastaging/~james-page/horizon/icehouse-rc1 |
| Merge into: | lp://qastaging/~ubuntu-server-dev/horizon/icehouse |
| Diff against target: |
19001 lines (+9652/-8832) 12 files modified
debian/changelog (+8/-0) debian/static/openstack-dashboard/css/6bd71a04f0c0.css (+6567/-0) debian/static/openstack-dashboard/css/d7c9941bd6da.css (+0/-6564) debian/static/openstack-dashboard/js/39784d94d67e.js (+0/-2014) debian/static/openstack-dashboard/js/3ae78267141c.js (+2339/-0) debian/static/openstack-dashboard/manifest.json (+2/-2) debian/theme/css/ubuntu.css (+726/-166) debian/theme/templates/403.html (+0/-28) debian/theme/templates/404.html (+0/-27) debian/theme/templates/500.html (+0/-27) debian/theme/templates/_stylesheets.html (+10/-0) debian/theme/ubuntu_theme.py (+0/-4) |
| To merge this branch: | bzr merge lp://qastaging/~james-page/horizon/icehouse-rc1 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Server Developers | Pending | ||
|
Review via email:
|
|||
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
