Merge lp:~wallyworld/launchpad/db-devel-merge-conflict-fix into lp:launchpad/db-devel
Proposed by
Ian Booth
| Status: | Merged |
|---|---|
| Approved by: | Ian Booth |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 12111 |
| Proposed branch: | lp:~wallyworld/launchpad/db-devel-merge-conflict-fix |
| Merge into: | lp:launchpad/db-devel |
| Diff against target: | 0 lines |
| To merge this branch: | bzr merge lp:~wallyworld/launchpad/db-devel-merge-conflict-fix |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ian Booth (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Merge stable into db-devel, resolving conflicts
Description of the change
Merge stable into db-devel, resolving conflicts
To post a comment you must log in.
Revision history for this message
| Ian Booth (wallyworld) | # |
review:
Approve
