« back to all changes in this revision
Viewing changes to lib/lp/bugs/stories/bugattachments/xx-bugattachments.txt
- Committer: Francis J. Lacoste
- Date: 2011-12-06 20:10:56 UTC
- mfrom: (14448 devel)
- mto: This revision was merged to the branch mainline in revision 14474.
- Revision ID: francis.lacoste@canonical.com-20111206201056-jk8q5euywtd4vqk7
Merge devel.
- lib/lp/app/javascript/indicator
- lib/lp/app/javascript/indicator/assets
- lib/lp/app/javascript/indicator/assets/skins
- lib/lp/app/javascript/indicator/assets/skins/sam
- lib/lp/app/javascript/indicator/tests
- files removed:
- lib/canonical/launchpad/pagetitles.py
- lib/canonical/launchpad/vocabularies
- lib/canonical/launchpad/vocabularies/tests
- files renamed:
- lib/lp/bugs/vocabulary.py => lib/lp/bugs/vocabularies.py
- lib/canonical/launchpad/vocabularies/dbobjects.py => lib/lp/translations/vocabularies.py
- lib/canonical/launchpad/vocabularies/configure.zcml => lib/lp/translations/vocabularies.zcml
- files modified:
- buildout-templates/bin/combine-css.in
added
removed
lib/lp/bugs/stories/bugattachments/xx-bugattachments.txt
