Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/diversify/janu
Browse files Browse the repository at this point in the history
  • Loading branch information
arneson committed Nov 23, 2014
2 parents cc006d8 + b3e2ed0 commit cd930e7
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 2 deletions.
Binary file removed content/image/main-2.psd
Binary file not shown.
Binary file removed content/image/splash-screen.psd
Binary file not shown.
Binary file removed content/image/winning-screen.psd
Binary file not shown.
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

<link rel="stylesheet" href="content/style.css" type="text/css" />

<link href='http://fonts.googleapis.com/css?family=Questrial' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Questrial' rel='stylesheet' type='text/css'>

<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>

<script src="scripts/underscore-min.js" type="text/javascript"></script>
<script src="scripts/musicPlayer.js" type="text/javascript"></script>
Expand Down

0 comments on commit cd930e7

Please sign in to comment.