mirror of
https://github.com/ForkAwesome/Fork-Awesome
synced 2024-05-23 08:42:13 +02:00
funkwale issues
This commit is contained in:
parent
90881bcdcd
commit
0c30b9d87a
|
@ -3,6 +3,7 @@
|
||||||
<!--
|
<!--
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
2020-4-12: Created with FontForge (http://fontforge.org)
|
2020-4-12: Created with FontForge (http://fontforge.org)
|
||||||
-->
|
-->
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
|
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
|
||||||
|
@ -20,6 +21,12 @@ Created by FontForge 20170924 at Sun Apr 12 18:44:30 2020
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
|
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
|
||||||
<metadata>
|
<metadata>
|
||||||
>>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale
|
>>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale
|
||||||
|
=======
|
||||||
|
2019-11-21: Created with FontForge (http://fontforge.org)
|
||||||
|
-->
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
|
||||||
|
<metadata>
|
||||||
|
>>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale
|
||||||
Created by FontForge 20190801 at Thu Nov 21 23:09:04 2019
|
Created by FontForge 20190801 at Thu Nov 21 23:09:04 2019
|
||||||
By Helmut K. C. Tessarek
|
By Helmut K. C. Tessarek
|
||||||
>>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale
|
>>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale
|
||||||
|
@ -39,11 +46,15 @@ The Fork Awesome font is licensed under the SIL OFL 1.1 (http://scripts.sil.org/
|
||||||
underline-thickness="89.6"
|
underline-thickness="89.6"
|
||||||
underline-position="-179.2"
|
underline-position="-179.2"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
unicode-range="U+0020-F36A"
|
unicode-range="U+0020-F36A"
|
||||||
=======
|
=======
|
||||||
unicode-range="U+0020-F338"
|
unicode-range="U+0020-F338"
|
||||||
>>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale
|
>>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale
|
||||||
|
=======
|
||||||
|
unicode-range="U+0020-F338"
|
||||||
|
>>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale
|
||||||
=======
|
=======
|
||||||
unicode-range="U+0020-F338"
|
unicode-range="U+0020-F338"
|
||||||
>>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale
|
>>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale
|
||||||
|
|
Before Width: | Height: | Size: 607 KiB After Width: | Height: | Size: 608 KiB |
|
@ -1,6 +1,7 @@
|
||||||
{
|
{
|
||||||
"checksum": {
|
"checksum": {
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
"previous": "73605d4fb437fe6cb99fb960cde3c0f71e84173e95019f76d8c108dcaab8578a",
|
"previous": "73605d4fb437fe6cb99fb960cde3c0f71e84173e95019f76d8c108dcaab8578a",
|
||||||
"current": "73605d4fb437fe6cb99fb960cde3c0f71e84173e95019f76d8c108dcaab8578a"
|
"current": "73605d4fb437fe6cb99fb960cde3c0f71e84173e95019f76d8c108dcaab8578a"
|
||||||
|
@ -8,6 +9,10 @@
|
||||||
"previous": "d0e6cb1502b28a1bff1f0c82ba4613e03537e428eddae4124d7d09535a77771d",
|
"previous": "d0e6cb1502b28a1bff1f0c82ba4613e03537e428eddae4124d7d09535a77771d",
|
||||||
"current": "d0e6cb1502b28a1bff1f0c82ba4613e03537e428eddae4124d7d09535a77771d"
|
"current": "d0e6cb1502b28a1bff1f0c82ba4613e03537e428eddae4124d7d09535a77771d"
|
||||||
>>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale
|
>>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale
|
||||||
|
=======
|
||||||
|
"previous": "d0e6cb1502b28a1bff1f0c82ba4613e03537e428eddae4124d7d09535a77771d",
|
||||||
|
"current": "d0e6cb1502b28a1bff1f0c82ba4613e03537e428eddae4124d7d09535a77771d"
|
||||||
|
>>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale
|
||||||
=======
|
=======
|
||||||
"previous": "d0e6cb1502b28a1bff1f0c82ba4613e03537e428eddae4124d7d09535a77771d",
|
"previous": "d0e6cb1502b28a1bff1f0c82ba4613e03537e428eddae4124d7d09535a77771d",
|
||||||
"current": "d0e6cb1502b28a1bff1f0c82ba4613e03537e428eddae4124d7d09535a77771d"
|
"current": "d0e6cb1502b28a1bff1f0c82ba4613e03537e428eddae4124d7d09535a77771d"
|
||||||
|
|
|
@ -7444,6 +7444,7 @@ icons:
|
||||||
categories:
|
categories:
|
||||||
- Brand Icons
|
- Brand Icons
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
|
||||||
- name: Funkwhale
|
- name: Funkwhale
|
||||||
|
@ -7874,3 +7875,5 @@ icons:
|
||||||
>>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale
|
>>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale
|
||||||
=======
|
=======
|
||||||
>>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale
|
>>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale
|
||||||
|
=======
|
||||||
|
>>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale
|
||||||
|
|
Loading…
Reference in a new issue