Merge lp://staging/~canonical-isd-hackers/canonical-identity-provider/hyphenation into lp://staging/~canonical-isd-hackers/canonical-identity-provider/stable
Proposed by
David Owen
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 42 | ||||||||
| Proposed branch: | lp://staging/~canonical-isd-hackers/canonical-identity-provider/hyphenation | ||||||||
| Merge into: | lp://staging/~canonical-isd-hackers/canonical-identity-provider/stable | ||||||||
| Diff against target: |
247 lines (+25/-25) 15 files modified
identityprovider/forms.py (+1/-1) identityprovider/models/authtoken.py (+1/-1) identityprovider/templates/enter_token.html (+5/-5) identityprovider/templates/launchpad/email/email-validation-token.txt (+1/-1) identityprovider/templates/launchpad/email/forgottenpassword.txt (+1/-1) identityprovider/templates/launchpad/email/newuser.txt (+1/-1) identityprovider/templates/registration/bad_token.html (+3/-3) identityprovider/templates/registration/email_sent.html (+2/-2) identityprovider/templates/registration/logout_to_confirm.html (+2/-2) identityprovider/templates/ubuntu/email/email-validation-token.txt (+1/-1) identityprovider/templates/ubuntu/email/forgottenpassword.txt (+1/-1) identityprovider/templates/ubuntu/email/newuser.txt (+1/-1) identityprovider/tests/test_views_ui.py (+1/-1) identityprovider/views/account.py (+3/-3) identityprovider/views/ui.py (+1/-1) |
||||||||
| To merge this branch: | bzr merge lp://staging/~canonical-isd-hackers/canonical-identity-provider/hyphenation | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ricardo Kirkner (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Fixed hyphenation issue mentioned by Stuart in the bug report.
To post a comment you must log in.
Revision history for this message
| Ricardo Kirkner (ricardokirkner) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
