Merge branch 'wip-1.1.0' of github.com:ForkAwesome/Fork-Awesome into …

…wip-1.1.0

README.md

@@ -67,6 +67,7 @@ to the `dependencies` in your `component.json`.
 - Ruby Development Headers
   - **Ubuntu:** `sudo apt-get install ruby-dev` *(Only if you're __NOT__ using `rbenv` or `rvm`)*
   - **Windows:** [DevKit](http://rubyinstaller.org/)
+  - **macOS:** no extra step required
 - [Bundler](http://bundler.io/) (Run `gem install bundler` to install).
 - [Node Package Manager (aka. `npm`)](https://docs.npmjs.com/getting-started/installing-node)
 
@@ -83,7 +84,7 @@ Build the web documentation:
 
     $ npm run build
 
-Or serve it on a local server on http://localhost:7998/Fork-Awesome/:
+Or serve it on a local server (http://localhost:7998):
 
     $ npm run dev
 

src/icons/.fontcustom-manifest.json

@@ -1,7 +1,7 @@
 {
   "checksum": {
-    "previous": "ac00bab72106d29e87bd4611b91a455e3646ae11d2d2899e6c601fdffe47f047",
-    "current": "ac00bab72106d29e87bd4611b91a455e3646ae11d2d2899e6c601fdffe47f047"
+    "previous": "5ba8f7738f5ba72f24cefb1362ac0a1ac22cccd5d7054192255cd1d3c3e32d5c",
+    "current": "5ba8f7738f5ba72f24cefb1362ac0a1ac22cccd5d7054192255cd1d3c3e32d5c"
   },
   "fonts": [
     "forkawesome/forkawesome.ttf",
@@ -947,6 +947,10 @@
       "codepoint": 61826,
       "source": "svg/female.svg"
     },
+    "ffmpeg": {
+      "codepoint": 62223,
+      "source": "svg/ffmpeg.svg"
+    },
     "fighter-jet": {
       "codepoint": 61691,
       "source": "svg/fighter-jet.svg"
@@ -1207,6 +1211,10 @@
       "codepoint": 62183,
       "source": "svg/gnu-social.svg"
     },
+    "gnupg": {
+      "codepoint": 62221,
+      "source": "svg/gnupg.svg"
+    },
     "google": {
       "codepoint": 61856,
       "source": "svg/google.svg"
@@ -1879,6 +1887,10 @@
       "codepoint": 61592,
       "source": "svg/phone-square.svg"
     },
+    "php": {
+      "codepoint": 62222,
+      "source": "svg/php.svg"
+    },
     "picture-o": {
       "codepoint": 61502,
       "source": "svg/picture-o.svg"

src/icons/icons.yml

@@ -7003,5 +7003,27 @@ icons:
     filter:
       - message
       - texting
+
+  - name:       GnuPG
+    id:         gnupg
+    unicode:    f30d
+    created:    1.0
+    url:        gnupg.org
+    categories:
+      - Brand Icons
+
+  - name:       PHP
+    id:         php
+    unicode:    f30e
+    created:    1.0
+    url:        php.net
+    categories:
+      - Brand Icons
+
+  - name:       FFmpeg
+    id:         ffmpeg
+    unicode:    f30f
+    created:    1.0
+    url:        ffmpeg.org
     categories:
       - Brand Icons