Merge lp://staging/~daker/summit/fix.1147863 into lp://staging/summit
Proposed by
Adnane Belmadiaf
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~daker/summit/fix.1147863 |
| Merge into: | lp://staging/summit |
| Diff against target: |
279 lines (+121/-69) (has conflicts) 7 files modified
Makefile (+1/-1) summit/common/templates/common/index.html (+11/-12) summit/media/css/style.css (+48/-0) summit/schedule/templates/schedule/summit.html (+13/-49) summit/schedule/templates/schedule/summit_info.html (+31/-7) summit/schedule/views.py (+16/-0) summit/urls.py (+1/-0) Text conflict in summit/schedule/templates/schedule/summit.html |
| To merge this branch: | bzr merge lp://staging/~daker/summit/fix.1147863 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Summit Hackers | Pending | ||
|
Review via email:
|
|||
Description of the change
This is a Work in progress (DO NOT MERGE)
To post a comment you must log in.
Unmerged revisions
- 507. By Adnane Belmadiaf
-
Revet code
- 506. By Adnane Belmadiaf
-
Stop requiring someone to be 'attending' in LP
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
