Skip to content

Commit 5316b5f

Browse files
authored
Merge branch 'develop' into develop
2 parents 2868449 + 14c0df6 commit 5316b5f

13 files changed

Lines changed: 107 additions & 2 deletions

devicon.json

Lines changed: 95 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4057,6 +4057,27 @@
40574057
"color": "#378BBA",
40584058
"aliases": []
40594059
},
4060+
{
4061+
"name": "fusion",
4062+
"altnames": [
4063+
"Autodesk Fusion",
4064+
"Autodesk Fusion 360"
4065+
],
4066+
"tags": [
4067+
"design"
4068+
],
4069+
"versions": {
4070+
"svg": [
4071+
"original",
4072+
"plain"
4073+
],
4074+
"font": [
4075+
"plain"
4076+
]
4077+
},
4078+
"color": "#FF6A00",
4079+
"aliases": []
4080+
},
40604081
{
40614082
"name": "gardener",
40624083
"altnames": [],
@@ -4357,10 +4378,13 @@
43574378
"versions": {
43584379
"svg": [
43594380
"original",
4360-
"plain"
4381+
"original-wordmark",
4382+
"plain",
4383+
"plain-wordmark"
43614384
],
43624385
"font": [
4363-
"plain"
4386+
"plain",
4387+
"plain-wordmark"
43644388
]
43654389
},
43664390
"color": "#2088FF",
@@ -7236,6 +7260,27 @@
72367260
"color": "#2A9790",
72377261
"aliases": []
72387262
},
7263+
{
7264+
"name": "mercurial",
7265+
"altnames": [],
7266+
"tags": [
7267+
"version-control"
7268+
],
7269+
"versions": {
7270+
"svg": [
7271+
"original",
7272+
"original-wordmark",
7273+
"plain",
7274+
"plain-wordmark"
7275+
],
7276+
"font": [
7277+
"plain",
7278+
"plain-wordmark"
7279+
]
7280+
},
7281+
"color": "#999",
7282+
"aliases": []
7283+
},
72397284
{
72407285
"name": "meteor",
72417286
"altnames": [
@@ -12671,6 +12716,36 @@
1267112716
}
1267212717
]
1267312718
},
12719+
{
12720+
"name": "twilio",
12721+
"altnames": [],
12722+
"tags": [
12723+
"api",
12724+
"automation",
12725+
"platform"
12726+
],
12727+
"versions": {
12728+
"svg": [
12729+
"original",
12730+
"original-wordmark"
12731+
],
12732+
"font": [
12733+
"original",
12734+
"original-wordmark"
12735+
]
12736+
},
12737+
"color": "#f22f46",
12738+
"aliases": [
12739+
{
12740+
"base": "original",
12741+
"alias": "plain"
12742+
},
12743+
{
12744+
"base": "original-wordmark",
12745+
"alias": "plain-wordmark"
12746+
}
12747+
]
12748+
},
1267412749
{
1267512750
"name": "twitter",
1267612751
"altnames": [
@@ -14143,5 +14218,23 @@
1414314218
},
1414414219
"color": "#000",
1414514220
"aliases": []
14221+
},
14222+
{
14223+
"name": "zustand",
14224+
"altnames": [],
14225+
"tags": [
14226+
"framework"
14227+
],
14228+
"versions": {
14229+
"svg": [
14230+
"original",
14231+
"plain"
14232+
],
14233+
"font": [
14234+
"plain"
14235+
]
14236+
},
14237+
"color": "#443e38",
14238+
"aliases": []
1414614239
}
1414714240
]

icons/fusion/fusion-original.svg

Lines changed: 1 addition & 0 deletions
Loading

icons/fusion/fusion-plain.svg

Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)