Merge lp://staging/~dholbach/developer-ubuntu-com/1525202 into lp://staging/developer-ubuntu-com
Proposed by
Daniel Holbach
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~dholbach/developer-ubuntu-com/1525202 |
| Merge into: | lp://staging/developer-ubuntu-com |
| Diff against target: |
313 lines (+91/-26) (has conflicts) 7 files modified
Makefile (+16/-3) developer_portal/blog/views.py (+15/-5) developer_portal/management/commands/initdb.py (+25/-14) developer_portal/settings.py (+6/-0) locale/developer_portal.pot (+4/-4) pip-cache-revno.txt (+4/-0) requirements.txt (+21/-0) Text conflict in Makefile Text conflict in developer_portal/management/commands/initdb.py Text conflict in developer_portal/settings.py Text conflict in pip-cache-revno.txt Text conflict in requirements.txt |
| To merge this branch: | bzr merge lp://staging/~dholbach/developer-ubuntu-com/1525202 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu App Developer site developers | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2015-12-11.
This proposal has been superseded by a proposal from 2015-12-11.
To post a comment you must log in.
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
