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

Merge branch 'upgrade-font-awesome' into 'master'
a6a7a5dd · Robert Speicher · db0da43a · 057244b4 · a6a7a5dd
Commit a6a7a5dd authored Mar 27, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Gemfile.lock Gemfile.lock +2 -2

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -325,8 +325,8 @@ GEM
    fog-xml (0.1.2)
      fog-core
      nokogiri (~> 1.5, >= 1.5.11)
-    font-awesome-rails (4.5.0.0)
-      railties (>= 3.2, < 5.0)
+    font-awesome-rails (4.5.0.1)
+      railties (>= 3.2, < 5.1)
    foreman (0.78.0)
      thor (~> 0.19.1)
    formatador (0.2.5)