← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/services/features/flags.py

  • 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.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/services/features/flags.py
198
198
     '',
199
199
     '',
200
200
     ''),
201
 
    ('disclosure.delete_bugtask.enabled',
202
 
     'boolean',
203
 
     'Enables bugtasks to be deleted by authorised users.',
204
 
     '',
205
 
     '',
206
 
     ''),
207
201
    ('disclosure.allow_multipillar_private_bugs.enabled',
208
202
     'boolean',
209
203
     'Allows private bugs to have more than one bug task.',