Merge launchpad:master into launchpad:db-devel
Proposed by
Colin Watson
| Status: | Merged |
|---|---|
| Merged at revision: | c8098b989a584ec2ecc82ee03ad4b5e0f4b9f613 |
| Proposed branch: | launchpad:master |
| Merge into: | launchpad:db-devel |
| Diff against target: |
85 lines (+10/-11) 6 files modified
doc/_static/.gitignore (+0/-0) doc/_templates/.gitignore (+0/-0) lib/lp/answers/configure.zcml (+0/-2) lib/lp/app/tests/test_help.py (+0/-4) lib/lp/services/mail/tests/test_stub.py (+8/-5) scripts/update-version-info.sh (+2/-0) |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Colin Watson (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Manually merge from master to fix building on git
To post a comment you must log in.
Revision history for this message
| Colin Watson (cjwatson) | # |
review:
Approve
Revision history for this message
| Otto Co-Pilot (otto-copilot) wrote | # |
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
There was nothing to merge
https:/