FortAwesome · robmadole · Jul 29, 2019 · Jul 29, 2019
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/) and this
 repository that is by invitation only. You will get a 404 - Not Found if you do
 not have access**
 
+## [5.10.0](https://github.com/FortAwesome/Font-Awesome/releases/tag/5.10.0) - 2019-07-29
+
+### Added
+* Duotone icons style added with over 1,600 new icons
+* New conflict detection script to help identify conflicting versions of Font Awesome (js/conflict-detection.js)
+* Icons border-center-v and border-center-h
+* New brand icon for cotton-bureau
+
+### Changed
+* Updated version 4 shim to more accurately match sort-alpha-desc, sort-amount-desc, sort-numeric-desc
+
+### Fixed
+* Icon sort-amount-down-alt incorrectly matching sort-amount-down
+* Icon border-outer icon missing inner grid shapes
+
+---
+
 ## [5.9.0](https://github.com/FortAwesome/Font-Awesome/releases/tag/5.9.0) - 2019-06-04
 
 **Minor version upgrade notice: there are some backward-incompatible changes to this release. See the

diff --git a/UPGRADING.md b/UPGRADING.md
@@ -8,6 +8,16 @@ As always, [submit issues](https://github.com/FortAwesome/Font-Awesome/issues/ne
 
 ---
 
+## 5.9.0 to 5.10.0
+
+The following icon shims have been changed to better match the original version 4 icon:
+
+* sort-alpha-desc
+* sort-amount-desc
+* sort-numeric-desc
+
+---
+
 ## 5.8.2 to 5.9.0
 
 The nintendo-switch icon has been removed by legal request of Nintendo of America Inc.

diff --git a/css/all.css b/css/all.css
@@ -1,11 +1,12 @@
 /*!
- * Font Awesome Free 5.9.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 5.10.0 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  */
 .fa,
 .fas,
 .far,
 .fal,
+.fad,
 .fab {
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
@@ -1088,6 +1089,9 @@ readers do not read off random characters that represent icons */
 .fa-copyright:before {
   content: "\f1f9"; }
 
+.fa-cotton-bureau:before {
+  content: "\f89e"; }
+
 .fa-couch:before {
   content: "\f4b8"; }
 

diff --git a/css/all.min.css b/css/all.min.css
diff --git a/css/brands.css b/css/brands.css
@@ -1,5 +1,5 @@
 /*!
- * Font Awesome Free 5.9.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 5.10.0 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  */
 @font-face {

diff --git a/css/brands.min.css b/css/brands.min.css
diff --git a/css/fontawesome.css b/css/fontawesome.css
@@ -1,11 +1,12 @@
 /*!
- * Font Awesome Free 5.9.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 5.10.0 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  */
 .fa,
 .fas,
 .far,
 .fal,
+.fad,
 .fab {
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
@@ -1088,6 +1089,9 @@ readers do not read off random characters that represent icons */
 .fa-copyright:before {
   content: "\f1f9"; }
 
+.fa-cotton-bureau:before {
+  content: "\f89e"; }
+
 .fa-couch:before {
   content: "\f4b8"; }
 

diff --git a/css/fontawesome.min.css b/css/fontawesome.min.css
diff --git a/css/regular.css b/css/regular.css
@@ -1,5 +1,5 @@
 /*!
- * Font Awesome Free 5.9.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 5.10.0 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  */
 @font-face {

diff --git a/css/regular.min.css b/css/regular.min.css
diff --git a/css/solid.css b/css/solid.css
@@ -1,5 +1,5 @@
 /*!
- * Font Awesome Free 5.9.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 5.10.0 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  */
 @font-face {

diff --git a/css/solid.min.css b/css/solid.min.css
diff --git a/css/svg-with-js.css b/css/svg-with-js.css
@@ -1,5 +1,5 @@
 /*!
- * Font Awesome Free 5.9.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 5.10.0 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  */
 svg:not(:root).svg-inline--fa {
@@ -344,3 +344,28 @@ svg:not(:root).svg-inline--fa {
   overflow: visible;
   position: static;
   width: auto; }
+
+.svg-inline--fa .fa-primary {
+  fill: var(--fa-primary-color, currentColor);
+  opacity: 1;
+  opacity: var(--fa-primary-opacity, 1); }
+
+.svg-inline--fa .fa-secondary {
+  fill: var(--fa-secondary-color, currentColor);
+  opacity: 0.4;
+  opacity: var(--fa-secondary-opacity, 0.4); }
+
+.svg-inline--fa.fa-swap-opacity .fa-primary {
+  opacity: 0.4;
+  opacity: var(--fa-secondary-opacity, 0.4); }
+
+.svg-inline--fa.fa-swap-opacity .fa-secondary {
+  opacity: 1;
+  opacity: var(--fa-primary-opacity, 1); }
+
+.svg-inline--fa mask .fa-primary,
+.svg-inline--fa mask .fa-secondary {
+  fill: black; }
+
+.fad.fa-inverse {
+  color: #fff; }
diff --git a/css/svg-with-js.min.css b/css/svg-with-js.min.css
diff --git a/css/v4-shims.css b/css/v4-shims.css
@@ -1,5 +1,5 @@
 /*!
- * Font Awesome Free 5.9.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 5.10.0 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  */
 .fa.fa-glass:before {
@@ -747,19 +747,19 @@
   content: "\f15d"; }
 
 .fa.fa-sort-alpha-desc:before {
-  content: "\f15e"; }
+  content: "\f881"; }
 
 .fa.fa-sort-amount-asc:before {
   content: "\f160"; }
 
 .fa.fa-sort-amount-desc:before {
-  content: "\f161"; }
+  content: "\f884"; }
 
 .fa.fa-sort-numeric-asc:before {
   content: "\f162"; }
 
 .fa.fa-sort-numeric-desc:before {
-  content: "\f163"; }
+  content: "\f886"; }
 
 .fa.fa-youtube-square {
   font-family: 'Font Awesome 5 Brands';

diff --git a/css/v4-shims.min.css b/css/v4-shims.min.css
diff --git a/js-packages/@fortawesome/fontawesome-common-types/index.d.ts b/js-packages/@fortawesome/fontawesome-common-types/index.d.ts
@@ -1,4 +1,5 @@
-export type IconPrefix = "fas" | "fab" | "far" | "fal";
+export type IconPrefix = "fas" | "fab" | "far" | "fal" | "fad";
+export type IconPathData = string | string[]
 
 export interface IconLookup {
   prefix: IconPrefix;
@@ -12,7 +13,7 @@ export interface IconDefinition extends IconLookup {
     number, // height
     string[], // ligatures
     string, // unicode
-    string // svgPathData
+    IconPathData // svgPathData
   ];
 }
 
@@ -93,6 +94,7 @@ export type IconName = '500px' |
   'confluence' | 
   'connectdevelop' | 
   'contao' | 
+  'cotton-bureau' | 
   'cpanel' | 
   'creative-commons' | 
   'creative-commons-by' | 

diff --git a/js-packages/@fortawesome/fontawesome-common-types/package.json b/js-packages/@fortawesome/fontawesome-common-types/package.json
@@ -47,7 +47,7 @@
     "node": ">=6"
   },
   "dependencies": {},
-  "version": "0.2.19",
+  "version": "0.2.20",
   "name": "@fortawesome/fontawesome-common-types",
   "license": "MIT",
   "types": "./index.d.ts"

diff --git a/js-packages/@fortawesome/fontawesome-free/css/all.css b/js-packages/@fortawesome/fontawesome-free/css/all.css
@@ -1,11 +1,12 @@
 /*!
- * Font Awesome Free 5.9.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 5.10.0 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  */
 .fa,
 .fas,
 .far,
 .fal,
+.fad,
 .fab {
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
@@ -1088,6 +1089,9 @@ readers do not read off random characters that represent icons */
 .fa-copyright:before {
   content: "\f1f9"; }
 
+.fa-cotton-bureau:before {
+  content: "\f89e"; }
+
 .fa-couch:before {
   content: "\f4b8"; }