Merge lp://staging/~matthew.revell/launchpad/VAT-update into lp://staging/launchpad
Proposed by
Matthew Revell
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Graham Binns | ||||||||
| Approved revision: | no longer in the source branch. | ||||||||
| Merged at revision: | 12168 | ||||||||
| Proposed branch: | lp://staging/~matthew.revell/launchpad/VAT-update | ||||||||
| Merge into: | lp://staging/launchpad | ||||||||
| Diff against target: |
406 lines (+115/-115) 13 files modified
lib/canonical/launchpad/tour/api (+101/-101) lib/canonical/launchpad/tour/branch-hosting-tracking (+1/-1) lib/canonical/launchpad/tour/bugs (+1/-1) lib/canonical/launchpad/tour/community (+1/-1) lib/canonical/launchpad/tour/community-support (+1/-1) lib/canonical/launchpad/tour/feature-tracking (+1/-1) lib/canonical/launchpad/tour/index (+1/-1) lib/canonical/launchpad/tour/join-launchpad (+2/-2) lib/canonical/launchpad/tour/ppa (+1/-1) lib/canonical/launchpad/tour/release-management (+1/-1) lib/canonical/launchpad/tour/translation (+1/-1) lib/lp/app/stories/basics/copyright.txt (+2/-2) lib/lp/app/templates/base-layout-macros.pt (+1/-1) |
||||||||
| To merge this branch: | bzr merge lp://staging/~matthew.revell/launchpad/VAT-update | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Graham Binns (community) | code | Approve | |
|
Review via email:
|
|||
Commit message
[bug=697206,697208] [r=gmb][ui=none] Changes the VAT rate quoted in the tour to 20%, following increase in UK VAT. Also updates the tour and site-wide footer to include 2011 in the copyright message.
Description of the change
UK VAT increased to 20% today and is chargeable on Launchpad subscriptions made from within the EU. This change increases the VAT rate quoted in the tour to 20%.
I have also changed the copyright message in the footer (base-layout-
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
As discussed on IRC, the tour/api file is full of DOS line-endings. These need to be removed to avoid future pain.