Merge pull request #4 from mikesager/master

Fixed bug on app start: no such file to load -- flowplayer/engine (LoadError)
This commit is contained in:
Scott Davis 2012-02-29 22:52:26 -08:00
commit 280774db08

View File

@ -2,7 +2,7 @@ require 'flowplayer/player'
if defined?(Rails)
if Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >= 1
require 'flowplayer/engine'
require 'flowplayer/railties/engine'
end
require 'flowplayer/railtie'
end