Merge lp:~matthew.revell/launchpad/whatsnew-3111 into lp:launchpad

Proposed by Matthew Revell
Status: Merged
Approved by: Aaron Bentley
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~matthew.revell/launchpad/whatsnew-3111
Merge into: lp:launchpad
Diff against target: 22 lines (+6/-1)
2 files modified
lib/canonical/launchpad/templates/root-index.pt (+5/-0)
version.txt (+1/-1)
To merge this branch: bzr merge lp:~matthew.revell/launchpad/whatsnew-3111
Reviewer Review Type Date Requested Status
Guilherme Salgado (community) release-critical Approve
Aaron Bentley (community) Approve
Review via email: mp+15426@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Matthew Revell (matthew.revell) wrote :

Adds a blog post to the front page and updates version.txt.

Revision history for this message
Aaron Bentley (abentley) :
review: Approve
Revision history for this message
Guilherme Salgado (salgado) wrote :

Looks good

review: Approve (release-critical)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/launchpad/templates/root-index.pt'
2--- lib/canonical/launchpad/templates/root-index.pt 2009-11-18 11:04:50 +0000
3+++ lib/canonical/launchpad/templates/root-index.pt 2009-11-30 14:50:28 +0000
4@@ -133,6 +133,11 @@
5 <div id="homepage-blogposts" class="homepage-portlet">
6 <h2>Recent Launchpad blog posts</h2>
7 <ul>
8+ <li class="news">
9+ <a href="http://blog.launchpad.net/?p=1178">
10+ Working with bug mail</a><span class="registered"> &ndash; 02 Dec 2009</span><br />
11+ Get the most from Launchpad's bug notifications.
12+ </li>
13 <li class="news">
14 <a href="http://blog.launchpad.net/bazaar/accessing-git-subversion-and-mercurial-from-bazaar">
15 Git and Subversion from Bazaar</a><span class="registered"> &ndash; 29 Oct 2009</span><br />
16
17=== modified file 'version.txt'
18--- version.txt 2009-10-30 17:37:45 +0000
19+++ version.txt 2009-11-30 14:50:28 +0000
20@@ -1,1 +1,1 @@
21-3.1.10
22+3.1.11