glenux/wyrian
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:glenux/wyrian

Browse source 
Conflicts:
	index.html
This commit is contained in:
Arian Glander 2011-02-12 01:06:30 +01:00
commit 48273cccbe
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
index.html
View file

@ -11,4 +11,7 @@
<script type="text/javascript" src="js/jquery-1.5.js"></script> <script type="text/javascript" src="js/jquery-1.5.js"></script>
<script type="text/javascript" src="js/wyrian.js"></script> <script type="text/javascript" src="js/wyrian.js"></script>
</body> </body>
</html> </html>
=======
blbabnlazblk
>>>>>>> 8c9ce0771b3b31e23fad325f9fbc388eeacf8e5d