Merge branch 'master' of github.com:froala/wysiwyg-rails

Author: stefanneculai

README.md

@@ -13,10 +13,13 @@ Add this to your Gemfile:
 
 ```ruby
 gem "wysiwyg-rails"
+gem "font-awesome-sass"
 ```
 
 and run `bundle install`.
 
+Note, you can include your own alternative Font Awesome implementation rather than the `font-awesome-sass` gem if you like. In that case, you'll need to modify/remove the import statements below to work with your implementation.
+
 ## Include in assets
 
 In your `application.css.scss`, include the css file:

lib/wysiwyg-rails/engine.rb

@@ -1,5 +1,3 @@
-require "font-awesome-sass"
-
 module WYSIWYG
   module Rails
     class Engine < ::Rails::Engine

wysiwyg-rails.gemspec

@@ -15,5 +15,4 @@ Gem::Specification.new do |gem|
   gem.version       = WYSIWYG::Rails::VERSION
 
   gem.add_dependency "railties", ">= 3.2", "< 6.0"
-  gem.add_dependency "font-awesome-sass", ">= 4.4.0"
 end