Merge branch 'svg-template'

davidbenque · Feb 21, 2018 · 076d5c1 · 076d5c1
2 parents 4bbd478 + ff02b82
commit 076d5c1
Show file tree

Hide file tree

Showing 16 changed files with 346 additions and 38 deletions.
diff --git a/fonts/forkawesome-webfont.svg b/fonts/forkawesome-webfont.svg
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/icons/.fontcustom-manifest.json b/src/icons/.fontcustom-manifest.json
@@ -2786,4 +2786,4 @@
     "forkawesome/forkawesome.css",
     "forkawesome/forkawesome-preview.html"
   ]
-}
+}
diff --git a/src/icons/icon-template-inkscape.svg b/src/icons/icon-template-inkscape.svg
diff --git a/src/icons/svg/artstation.svg b/src/icons/svg/artstation.svg
diff --git a/src/icons/svg/diaspora.svg b/src/icons/svg/diaspora.svg
diff --git a/src/icons/svg/fork-awesome.svg b/src/icons/svg/fork-awesome.svg
diff --git a/src/icons/svg/friendica.svg b/src/icons/svg/friendica.svg
diff --git a/src/icons/svg/gnu-social.svg b/src/icons/svg/gnu-social.svg
diff --git a/src/icons/svg/hubzilla.svg b/src/icons/svg/hubzilla.svg
diff --git a/src/icons/svg/liberapay-square.svg b/src/icons/svg/liberapay-square.svg
-Original file line number
+Diff line change
@@ Expand Up / @@ -2786,4 +2786,4 @@ @@
         "forkawesome/forkawesome.css",
         "forkawesome/forkawesome-preview.html"
       ]
-    }
+    }