Merge lp://staging/~terriko/postorius/ghc12 into lp://staging/postorius
Proposed by
Terri
| Status: | Merged |
|---|---|
| Merged at revision: | 106 |
| Proposed branch: | lp://staging/~terriko/postorius/ghc12 |
| Merge into: | lp://staging/postorius |
| Diff against target: |
208 lines (+65/-7) (has conflicts) 6 files modified
src/postorius/forms.py (+9/-4) src/postorius/templates/postorius/lists/settings.html (+4/-0) src/postorius/templates/postorius/lists/summary.html (+15/-0) src/postorius/templates/postorius/menu/list_nav.html (+12/-0) src/postorius/templates/postorius/user_mailmansettings.html (+1/-3) src/postorius/templates/postorius/user_profile.html (+24/-0) Text conflict in src/postorius/templates/postorius/lists/settings.html Text conflict in src/postorius/templates/postorius/lists/summary.html Text conflict in src/postorius/templates/postorius/menu/list_nav.html Text conflict in src/postorius/templates/postorius/user_profile.html |
| To merge this branch: | bzr merge lp://staging/~terriko/postorius/ghc12 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Terri | Approve | ||
|
Review via email:
|
|||
Description of the change
Assorted bug fixes from GHC12
To post a comment you must log in.
Revision history for this message
| Terri (terriko) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
