Skip to content

Commit

Permalink
Merge branch 'master' of github.com:SteamLUG/steamlug.org
Browse files Browse the repository at this point in the history
  • Loading branch information
beansmyname committed Apr 11, 2015
2 parents 4f8764e + 5e5381b commit 961297b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion about-peeps.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</header>
<div class="panel-body">
<img src="/avatars/mnarikka.png" />
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec vulputate tellus non eleifend sollicitudin. In et est tincidunt, ornare tortor eget, aliquam justo. Pellentesque fermentum mollis euismod. Pellentesque libero eros, sollicitudin in laoreet a, ultrices quis odio. Fusce ipsum nulla, ullamcorper a odio ac, blandit mollis ligula. Suspendisse massa nisi, molestie at nisl non, pellentesque dapibus nulla. Vestibulum iaculis felis id ligula posuere lacinia.</p>
<p>A consumer of copious quantities of ammonium chloride and a lazy perfectionist. All my projects are eternal.</p>
</div>
</article>
Expand Down

0 comments on commit 961297b

Please sign in to comment.