Merge branch 'master' of github.com:Creaprog/Mamix

thedj21 · Jun 10, 2014 · 8453b42 · 8453b42
2 parents 785d18e + 1f3a5d1
commit 8453b42
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/footer.php b/footer.php
@@ -2,7 +2,7 @@
   <div class="panel-body">
     <p>Licence GPL v2</p>
   </div>
-  <div> class="panel-body">
+  <div class="panel-body">
   	<p>Uptime :	
 <?php
 $output = shell_exec('uptime');

diff --git a/header.php b/header.php
@@ -1,9 +1 @@
-<!--<div class="page-header">
-	<p>Uptime :	
-<?php
-		$output = shell_exec('uptime');
-		echo "<pre>$output</pre>";
-?>
-	</p>
-</div>--!>
-
+<!-- rien !-->