Permalink
Browse files

Merge branch 'refs/heads/master' into develop

Conflicts:
	demo/index.html
	jquery.flexslider-min.js
	jquery.flexslider.js
  • Loading branch information...
sarvaje committed May 8, 2013
2 parents f4197a0 + 6e75c8d commit 45ab003245b891832c84816d522e366fa690fa4d
Showing with 359 additions and 216 deletions.
  1. +0 −1 demo/index.html
  2. +1 −1 demo/video.html
  3. +358 −214 jquery.flexslider.js
View
@@ -11,7 +11,6 @@
<!-- Modernizr -->
<script src="js/modernizr.js"></script>
-
</head>
<body class="loading">
View
@@ -134,7 +134,7 @@ <h3>Video</h3>
</div>
<!-- jQuery -->
- <script src="//ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script>
+ <script src="http://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 -->
Oops, something went wrong.

0 comments on commit 45ab003

Please sign in to comment.