Merge branch 'master' of github.com:kevinmcdonagh/mashbox

kevinmcdonagh · Sep 5, 2010 · 36dcdd2 · 36dcdd2
2 parents 187dcbb + 60ecbb4
commit 36dcdd2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/code/ec.png b/code/ec.png
diff --git a/code/mashbox1.php b/code/mashbox1.php
@@ -111,6 +111,10 @@
                 </tbody>
             </table>
         </div>
+        <div id="footer" style="width:100%;text-align:center;padding-top:250px;">
+        		<img src="sc.png" height="50"/>
+        		<img src="ec.png" height="50"/>
+        </div>
     </div>
 	<div id="dialog" title="Making a Mash!">
 		<ol class="txt_mash">
@@ -157,4 +161,4 @@
 	?>
 	<input type="hidden" id="blah">
 </body>
-</html>
+</html>
diff --git a/code/mashbox2.sqlite b/code/mashbox2.sqlite
diff --git a/code/sc.png b/code/sc.png