Merge pull request #170 from bokmann/fa-4.6.2

Please update to 4.6.2
bokmann · May 5, 2016 · 4a0d570 · 4a0d570
2 parents cf18e00 + 8b74f8e
commit 4a0d570
Show file tree

Hide file tree

Showing 9 changed files with 89 additions and 75 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -34,7 +34,8 @@ See [GitHub Releases](https://github.com/bokmann/font-awesome-rails/releases)
     | 4.5.0.0 | dbc8d1b          | 4.5.0 release (new icons)                                                 |
     | 4.5.0.1 | dbc8d1b          | added official Rails 5 support                                            |
     | 4.6.0.0 | 5697be9          | 4.6.0 release (new icons)                                                 |
-    | 4.6.1.0 | 6535013          | 4.6.1 release (minor stylesheet fixes)                                    |
+    | 4.6.1.0 | 6535013          | [4.6.1 release](https://github.com/FortAwesome/Font-Awesome/pull/8962) (minor stylesheet fixes) |
+    | 4.6.2.0 | e7cc59d          | [4.6.2 release](https://github.com/FortAwesome/Font-Awesome/pull/9117) (fixes and new icons)    |
 
 **note on version 0.2.0**: FontAwesome now includes scss and sass files, but
 when I used them instead of the plain ol css file included in the project, it

diff --git a/app/assets/fonts/FontAwesome.otf b/app/assets/fonts/FontAwesome.otf
diff --git a/app/assets/fonts/fontawesome-webfont.eot b/app/assets/fonts/fontawesome-webfont.eot
diff --git a/app/assets/fonts/fontawesome-webfont.svg b/app/assets/fonts/fontawesome-webfont.svg
diff --git a/app/assets/fonts/fontawesome-webfont.ttf b/app/assets/fonts/fontawesome-webfont.ttf
diff --git a/app/assets/fonts/fontawesome-webfont.woff b/app/assets/fonts/fontawesome-webfont.woff
diff --git a/app/assets/fonts/fontawesome-webfont.woff2 b/app/assets/fonts/fontawesome-webfont.woff2
diff --git a/app/assets/stylesheets/font-awesome.css.erb b/app/assets/stylesheets/font-awesome.css.erb
@@ -1,5 +1,5 @@
 /*!
- *  Font Awesome 4.6.1 by @davegandy - http://fontawesome.io - @fontawesome
+ *  Font Awesome 4.6.2 by @davegandy - http://fontawesome.io - @fontawesome
  *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
  */
 /* FONT PATH
@@ -1389,7 +1389,7 @@
 .fa-digg:before {
   content: "\f1a6";
 }
-.fa-pied-piper:before {
+.fa-pied-piper-pp:before {
   content: "\f1a7";
 }
 .fa-pied-piper-alt:before {
@@ -1515,6 +1515,7 @@
   content: "\f1ce";
 }
 .fa-ra:before,
+.fa-resistance:before,
 .fa-rebel:before {
   content: "\f1d0";
 }
@@ -2163,6 +2164,18 @@
 .fa-snapchat-square:before {
   content: "\f2ad";
 }
+.fa-pied-piper:before {
+  content: "\f2ae";
+}
+.fa-first-order:before {
+  content: "\f2b0";
+}
+.fa-yoast:before {
+  content: "\f2b1";
+}
+.fa-themeisle:before {
+  content: "\f2b2";
+}
 .sr-only {
   position: absolute;
   width: 1px;

diff --git a/lib/font-awesome-rails/version.rb b/lib/font-awesome-rails/version.rb
@@ -1,6 +1,6 @@
 module FontAwesome
   module Rails
-    FA_VERSION = "4.6.1"
-    VERSION = "4.6.1.0"
+    FA_VERSION = "4.6.2"
+    VERSION = "4.6.2.0"
   end
 end