repos/franz
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git@github.com:ryanmcgrath/franz

Browse source 
Conflicts:
	js/franz.js
This commit is contained in:
Veno Server 2009-08-13 23:54:40 -05:00
commit de6dca8afc
2 changed files with 49 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
index.php
View file

@ -5,7 +5,7 @@
<title>Franz - client side color palettes from logos</title>
<link rel="stylesheet" type="text/css" media="screen" href="css/example.css">
<script type="text/javascript" src="http://images.webs.com/static/global/js/jquery/jquery-1.3.2.min.js"></script>
<script type="text/javascript" src="js/franz.js"></script>
<script type="text/javascript" src="js/franz.js"></script>
<script type="text/javascript" src="http://www.google-analytics.com/ga.js"></script>
<script type="text/javascript">
var img_input;