Merge branch 'master' of git://git.neuf.no/inside

This commit is contained in:
root@amen committed 2013-08-29 04:33:28 +02:00
commit d955cb10ee
2 files changed
+8 -2

No files matched your search

+1 -1
View File
@@ -78,7 +78,7 @@ class Page {
<?php echo get_gravatar( $user->email , 20 , 'mm' , 'g' , true ); ?>
</span>
<span class="username">
<a href="index.php?page=display-current-user"><?php echo( "$user->firstname; $user->lastname" ); ?></a>
<a href="index.php?page=display-current-user"><?php echo( "$user->firstname $user->lastname" ); ?></a>
</span>
<span class="logout">
(<a href="index.php?action=log-out">Logg ut</a>)