Skip to content

Commit

Permalink
Revert "Merge branch 'refs/heads/master' into develop"
Browse files Browse the repository at this point in the history
This reverts commit 45ab003, reversing
changes made to f4197a0.
  • Loading branch information
jdgarcia committed May 8, 2013
1 parent 45ab003 commit fbe77d5
Show file tree
Hide file tree
Showing 3 changed files with 216 additions and 359 deletions.
1 change: 1 addition & 0 deletions demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

<!-- Modernizr -->
<script src="js/modernizr.js"></script>

</head>
<body class="loading">

Expand Down
2 changes: 1 addition & 1 deletion demo/video.html
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ <h3>Video</h3>
</div>

<!-- jQuery -->
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="js/libs/jquery-1.7.min.js">\x3C/script>')</script>

<!-- FlexSlider -->
Expand Down
Loading

0 comments on commit fbe77d5

Please sign in to comment.