KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-12-08 04:28:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed stuff

Browse Source
This commit is contained in:
OptimusCrime
2014-10-16 19:32:28 +02:00
parent a54d6a0f20
commit 2e8b5f233e
6 changed files with 45 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/index.tpl
View File

@@ -61,6 +61,7 @@
</div>
</center>
</div>
<<<<<<< HEAD
<div class="footer small centered top anim bottom">
&copy; 2014 <a class="anim" href="//nixo.no">Nixo</a> &amp; <a class="anim" href="//kasperrt.no">KasperRT </a>&amp; David
</div>
@@ -72,5 +73,8 @@
<script type="text/javascript" src="static/js/admin.js"></script>
<script type="text/javascript" src="static/js/visualize.js"></script>
>>>>>>> Fixed template for the frontpage
=======
[[+include file="footer.tpl"]]
>>>>>>> Fixed stuff
</body>
</html>