Merging between branch is not the easiest with all these binaries com…

…mitted
davidbenque · Feb 21, 2018 · be42006 · be42006
1 parent 076d5c1
commit be42006
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 189 deletions.
diff --git a/fonts/forkawesome-webfont.eot b/fonts/forkawesome-webfont.eot
diff --git a/fonts/forkawesome-webfont.svg b/fonts/forkawesome-webfont.svg
diff --git a/fonts/forkawesome-webfont.ttf b/fonts/forkawesome-webfont.ttf
diff --git a/fonts/forkawesome-webfont.woff b/fonts/forkawesome-webfont.woff
diff --git a/fonts/forkawesome-webfont.woff2 b/fonts/forkawesome-webfont.woff2
diff --git a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.eot b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.eot
diff --git a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.svg b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.svg
diff --git a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.ttf b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.ttf
diff --git a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.woff b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.woff
diff --git a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.woff2 b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.woff2
diff --git a/src/icons/.fontcustom-manifest.json b/src/icons/.fontcustom-manifest.json
@@ -1,7 +1,7 @@
 {
   "checksum": {
-    "previous": "ab0ed2a3e3520062c4b23af863122cd698499316364d27fd291a976bb3a6502e",
-    "current": "ab0ed2a3e3520062c4b23af863122cd698499316364d27fd291a976bb3a6502e"
+    "previous": "0f3ddd83f70e423706d83c2b59e162fe96e01a4da890c1f437d79613dbb6946f",
+    "current": "0f3ddd83f70e423706d83c2b59e162fe96e01a4da890c1f437d79613dbb6946f"
   },
   "fonts": [
     "forkawesome/forkawesome.ttf",
@@ -2786,4 +2786,4 @@
     "forkawesome/forkawesome.css",
     "forkawesome/forkawesome-preview.html"
   ]
-}
+}
diff --git a/src/icons/svg/mastodon-alt.svg b/src/icons/svg/mastodon-alt.svg
diff --git a/src/icons/svg/mastodon.svg b/src/icons/svg/mastodon.svg