Merge lp:~ya-bo-ng/uds-project/title-change into lp:uds-project

Proposed by Anthony Dillon
Status: Merged
Approved by: Chris Johnston
Approved revision: 65
Merged at revision: 65
Proposed branch: lp:~ya-bo-ng/uds-project/title-change
Merge into: lp:uds-project
Diff against target: 39 lines (+4/-3)
3 files modified
.bzrignore (+1/-0)
partial-sponsors.php (+1/-1)
template-register.php (+2/-2)
To merge this branch: bzr merge lp:~ya-bo-ng/uds-project/title-change
Reviewer Review Type Date Requested Status
Chris Johnston (community) Approve
Review via email: mp+145002@code.launchpad.net

Description of the change

Updated sponsors title and removed enterprise summit from subtitle.

To post a comment you must log in.
Revision history for this message
Chris Johnston (cjohnston) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file '.bzrignore'
--- .bzrignore 1970-01-01 00:00:00 +0000
+++ .bzrignore 2013-01-25 17:51:31 +0000
@@ -0,0 +1,1 @@
1.project
02
=== modified file 'partial-sponsors.php'
--- partial-sponsors.php 2012-11-19 11:42:26 +0000
+++ partial-sponsors.php 2013-01-25 17:51:31 +0000
@@ -1,6 +1,6 @@
1 <div class="row row-sponsors">1 <div class="row row-sponsors">
2 <div class="span-12">2 <div class="span-12">
3 <h2>Proudly sponsored by</h2>3 <h2>Previously sponsored by</h2>
4 <div class="carousel-sponsors">4 <div class="carousel-sponsors">
5 <?php5 <?php
6 // Get posts6 // Get posts
77
=== modified file 'template-register.php'
--- template-register.php 2012-11-19 11:42:26 +0000
+++ template-register.php 2013-01-25 17:51:31 +0000
@@ -10,7 +10,7 @@
10 <div class="row row-hero">10 <div class="row row-hero">
11 <div class="span-6">11 <div class="span-6">
12 <h1>Register</h1>12 <h1>Register</h1>
13 <p>Apply to attend the Ubuntu Developer Summit or the Ubuntu Enterprise Summit.</p>13 <p>Apply to attend the Ubuntu Developer Summit.</p>
14 </div>14 </div>
15 </div><!-- END .row -->15 </div><!-- END .row -->
16 16
@@ -18,7 +18,7 @@
18 <div class="clearfix">18 <div class="clearfix">
19 <div class="span-4">19 <div class="span-4">
20 <h3>Registration</h3>20 <h3>Registration</h3>
21 <p>You can commence your registration for the Ubuntu Developer Summit or the Ubuntu Enterprise Summit from this page.</p>21 <p>You can commence your registration for the Ubuntu Developer Summit from this page.</p>
22 </div>22 </div>
23 <div class="span-4">23 <div class="span-4">
24 <div class="box-event developer">24 <div class="box-event developer">

Subscribers

People subscribed via source and target branches

to all changes: