Commit a6a7a5dd authored by Robert Speicher's avatar Robert Speicher

Merge branch 'upgrade-font-awesome' into 'master'

Upgrade font-awesome-rails to 4.5.0.1

Includes Rails 5 support.

[See Changelog for details](https://github.com/bokmann/font-awesome-rails/releases/tag/v4.5.0.1).

Working towards #14286.

See merge request !3399
parents db0da43a 057244b4
...@@ -325,8 +325,8 @@ GEM ...@@ -325,8 +325,8 @@ GEM
fog-xml (0.1.2) fog-xml (0.1.2)
fog-core fog-core
nokogiri (~> 1.5, >= 1.5.11) nokogiri (~> 1.5, >= 1.5.11)
font-awesome-rails (4.5.0.0) font-awesome-rails (4.5.0.1)
railties (>= 3.2, < 5.0) railties (>= 3.2, < 5.1)
foreman (0.78.0) foreman (0.78.0)
thor (~> 0.19.1) thor (~> 0.19.1)
formatador (0.2.5) formatador (0.2.5)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment