Merge lp://staging/~daniel-watkins-credativ/poweremail/dw-fix-v6 into lp://staging/~openerp-commiter/poweremail/poweremail-v6
Proposed by
Daniel Watkins (credativ)
| Status: | Merged |
|---|---|
| Merged at revision: | 217 |
| Proposed branch: | lp://staging/~daniel-watkins-credativ/poweremail/dw-fix-v6 |
| Merge into: | lp://staging/~openerp-commiter/poweremail/poweremail-v6 |
| Diff against target: |
169 lines (+40/-28) 3 files modified
poweremail_serveraction_view.xml (+14/-0) poweremail_template.py (+16/-11) poweremail_template_view.xml (+10/-17) |
| To merge this branch: | bzr merge lp://staging/~daniel-watkins-credativ/poweremail/dw-fix-v6 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Niels Huylebroeck (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
This contains my ongoing fixes to the v6 branch, as I integrate into our v6 systems.
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
A bit unfortunate you merged your other branches into this one as well (as it provides a more cluttered overview of changes this branch does), but I was able to merge succesfully with bzr and the conflicts found were minor (whitespaces etc).