Merge lp:~raoul-snyman/ubuntu-za/sawubona into lp:ubuntu-za

Proposed by Raoul Snyman
Status: Merged
Merged at revision: 17
Proposed branch: lp:~raoul-snyman/ubuntu-za/sawubona
Merge into: lp:ubuntu-za
Diff against target: 12 lines (+1/-1)
1 file modified
pages/index.rst (+1/-1)
To merge this branch: bzr merge lp:~raoul-snyman/ubuntu-za/sawubona
Reviewer Review Type Date Requested Status
Gustav H Meyer Approve
Review via email: mp+248672@code.launchpad.net

Description of the change

Made our jumbotron a little more South African

To post a comment you must log in.
Revision history for this message
Gustav H Meyer (inetpro) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'pages/index.rst'
--- pages/index.rst 2015-02-04 19:06:46 +0000
+++ pages/index.rst 2015-02-04 20:21:48 +0000
@@ -10,7 +10,7 @@
10.. raw:: html10.. raw:: html
11 11
12 <div class="jumbotron frontpage">12 <div class="jumbotron frontpage">
13 <h1>Hello, world!</h1>13 <h1>Sawubona Mhlaba! <small>(Hello, world!)</small></h1>
14 <p>Ubuntu-ZA is the Ubuntu Local Community in South Africa. We are a diverse set of people located around South Africa (and some abroad) who are enthusiastic about Ubuntu, Linux and Open Source Software.</p>14 <p>Ubuntu-ZA is the Ubuntu Local Community in South Africa. We are a diverse set of people located around South Africa (and some abroad) who are enthusiastic about Ubuntu, Linux and Open Source Software.</p>
15 <p>Please join us in using, working on, and helping others with Ubuntu.</p>15 <p>Please join us in using, working on, and helping others with Ubuntu.</p>
16 <p><a href="/getting-involved.html" class="btn btn-primary btn-lg" role="button">Get involved &raquo;</a></p>16 <p><a href="/getting-involved.html" class="btn btn-primary btn-lg" role="button">Get involved &raquo;</a></p>

Subscribers

People subscribed via source and target branches