Viewing all changes in revision 7675.745.51.
- Committer: Launchpad Patch Queue Manager
- Date: 2010-07-23 13:55:20 UTC
- mfrom: (7675.753.1 resolve-conflicts)
- mto: (11121.4.11 package-build-recipe) (10888.7.1 buildd-failure-counting) (7675.937.1 recife) (11017.4.3 archive-job-db) (11235.7.3 bug-39674-flip-lfa-restricted-flag) (11204.5.8 test-ddeb-matching) (11151.7.1 vostok-traverse-distros) (11122.3.21 remove-variant) (11128.12.11 vostok-traverse-distro) (11316.3.5 fix-cancel-rescore-permissions) (11320.1.3 bug-490659-series-timeout) (6374.17.1 openid-auth) (11517.1.1 distro-series-difference-browser2-for-devel) (11474.5.12 xmlrpc-tests) (11149.12.76 lp-service) (11486.3.12 incremental-db) (11526.5.1 structural-subscriptions-with-filters) (11713.1.1 wire-up-filter-subs-bug-655567-devel) (13155.1.1 remote-bugtracker-components-ui-0) (11737.4.9 librarian) (12269.5.4 merge-job-schema) (12366.7.3 bug164196) (12411.5.2 auto-creation-merged) (12959.6.1 stevenk--db-use-dsp) (13023.7.1 bug-772763-remove-unmute-dialog-part1) (13164.2.1 init-multiple-parents-bug-777120-devel) (13117.2.2 init-multiple-parents-backend) (13168.12.1 init-series-bug-789091-devel) (13166.1.1 db-stable-merge-again) (13268.1.6 bug-534203) (13506.11.1 remove-unused-potmsgsets) (8758.3.19 garbo) (13465.2.23 staging) (13404.4.11 multiarch-translations) (14099.1.1 dsp-vocab-ui) (14181.1.1 db-stable-merge) (14183.1.1 db-stable-merge) (14187.1.1 db-stable-merge) (14186.5.20 observer-db) (9795.4.38 replication) (14403.2.5 recipe-format-0.4) (14046.1.1 bug-860245) (11881.1.1 mvo)
- mto: This revision was merged to the branch mainline in revision 11319.
- Revision ID: launchpad@pqm.canonical.com-20100723135520-2y25d41dbqs5fxao
[r=rockstar][ui=none] Fix the merge conflicts between devel and
db-devel
db-devel
- files added:
- lib/lp/answers/publisher.py
- files modified:
- lib/canonical/configure.zcml
expand all
collapse all
added
removed
