Permalink
Browse files

Merge pull request #13 from jrmyward/master

Remove jQuery from gem to prevent potential jQuery version collisions.
  • Loading branch information...
2 parents 78d45ed + 06d4bc8 commit 9b45ce50ccd319e3fbca0ee13f23d45e9055fbc8 @petebrowne petebrowne committed Oct 31, 2012
Showing with 1 addition and 2 deletions.
  1. +1 −1 README.md
  2. +0 −1 app/assets/javascripts/mediaelement_rails/index.js
View
@@ -1,6 +1,6 @@
# MediaelementRails #
-This neat project brings the cool [MediaElement.js](http://mediaelementjs.com/) (HTML5/Flash/Silverlight video player) to the Rails asset pipeline.
+This neat project brings the cool [MediaElement.js](http://mediaelementjs.com/) (HTML5/Flash/Silverlight video player) to the Rails asset pipeline. __*NOTE:*__ This gem requires jquery, which shouldn't be an issue.
## All you have to do is: ##
@@ -1,3 +1,2 @@
-//= require jquery
//= require ./rails
//= require ./mediaelementplayer

0 comments on commit 9b45ce5

Please sign in to comment.