← Back to branch summary

~launchpad-pqm/launchpad/devel

~launchpad-pqm/launchpad/devel

Viewing all changes in revision 14578.2.5.

Committer: William Grant
Date: 2011-12-22 12:37:42 UTC
mfrom: (14580 devel)
mto: This revision was merged to the branch mainline in revision 14581.
Revision ID: william.grant@canonical.com-20111222123742-knbahyqz7vx0ptne

Merge devel, resolving conflict.

files modified:
lib/canonical/launchpad/icing/css/components/bug_listing.css

lib/lp/bugs/browser/tests/test_bugtask.py

lib/lp/bugs/browser/tests/test_bugtask_navigation.py

lib/lp/bugs/mail/tests/test_bug_task_deletion.py

lib/lp/bugs/model/tests/test_bugtask.py

lib/lp/bugs/security.py

lib/lp/bugs/tests/test_bugchanges.py

lib/lp/services/features/flags.py

Show diffs side-by-side

added added

removed removed

lib/canonical/launchpad/icing/css/components/bug_listing.css

lib/lp/bugs/browser/tests/test_bugtask.py

lib/lp/bugs/browser/tests/test_bugtask_navigation.py

lib/lp/bugs/mail/tests/test_bug_task_deletion.py

lib/lp/bugs/model/tests/test_bugtask.py

lib/lp/bugs/security.py

lib/lp/bugs/tests/test_bugchanges.py

lib/lp/services/features/flags.py

Older »