Skip to content

Commit 83831f1

Browse files
authored
Merge branch 'develop' into develop
2 parents 70e9ea9 + 2151c72 commit 83831f1

7 files changed

Lines changed: 64 additions & 22 deletions

File tree

devicon.json

Lines changed: 60 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3211,16 +3211,16 @@
32113211
"android",
32123212
"ios",
32133213
"open-source"
3214-
],
3214+
],
32153215
"versions": {
32163216
"svg": [
32173217
"original",
32183218
"original-wordmark"
3219-
],
3219+
],
32203220
"font": [
32213221
"original",
32223222
"original-wordmark"
3223-
]
3223+
]
32243224
},
32253225
"color": "#ee350f",
32263226
"aliases": [
@@ -3740,20 +3740,30 @@
37403740
"gradlebuildtool"
37413741
],
37423742
"tags": [
3743+
"open-source",
37433744
"task-runner"
37443745
],
37453746
"versions": {
37463747
"svg": [
3747-
"plain",
3748-
"plain-wordmark"
3748+
"original",
3749+
"original-wordmark"
37493750
],
37503751
"font": [
3751-
"plain",
3752-
"plain-wordmark"
3752+
"original",
3753+
"original-wordmark"
37533754
]
37543755
},
37553756
"color": "#02303a",
3756-
"aliases": []
3757+
"aliases": [
3758+
{
3759+
"base": "original",
3760+
"alias": "plain"
3761+
},
3762+
{
3763+
"base": "original-wordmark",
3764+
"alias": "plain-wordmark"
3765+
}
3766+
]
37573767
},
37583768
{
37593769
"name": "grafana",
@@ -5004,21 +5014,21 @@
50045014
"aliases": []
50055015
},
50065016
{
5007-
"name": "kdeneon",
5017+
"name": "kdeneon",
50085018
"altnames": [],
50095019
"tags": [
50105020
"linux",
50115021
"operating system",
50125022
"open-source"
5013-
],
5023+
],
50145024
"versions": {
50155025
"svg": [
50165026
"original",
50175027
"plain"
5018-
],
5028+
],
50195029
"font": [
50205030
"plain"
5021-
]
5031+
]
50225032
},
50235033
"color": "#21769a",
50245034
"aliases": []
@@ -7504,6 +7514,36 @@
75047514
"color": "#b7111d",
75057515
"aliases": []
75067516
},
7517+
{
7518+
"name": "puppeteer",
7519+
"altnames": [],
7520+
"tags": [
7521+
"open-source",
7522+
"devtools protocol",
7523+
"testing",
7524+
"extension"
7525+
],
7526+
"versions": {
7527+
"svg": [
7528+
"original",
7529+
"plain"
7530+
],
7531+
"font": [
7532+
"plain"
7533+
]
7534+
},
7535+
"color": "#00d8a2",
7536+
"aliases": [
7537+
{
7538+
"base": "original",
7539+
"alias": "original-wordmark"
7540+
},
7541+
{
7542+
"base": "plain",
7543+
"alias": "plain-wordmark"
7544+
}
7545+
]
7546+
},
75077547
{
75087548
"name": "purescript",
75097549
"altnames": [],
@@ -7577,7 +7617,7 @@
75777617
"programming"
75787618
],
75797619
"versions": {
7580-
"svg": [
7620+
"svg": [
75817621
"original",
75827622
"original-wordmark",
75837623
"plain",
@@ -7589,7 +7629,7 @@
75897629
]
75907630
},
75917631
"color": "#3775a9",
7592-
"aliases": []
7632+
"aliases": []
75937633
},
75947634
{
75957635
"name": "pyscript",
@@ -8655,26 +8695,26 @@
86558695
]
86568696
},
86578697
{
8658-
"name": "reactrouter",
8698+
"name": "reactrouter",
86598699
"altnames": [],
86608700
"tags": [
86618701
"framework",
86628702
"react"
8663-
],
8703+
],
86648704
"versions": {
86658705
"svg": [
86668706
"original",
86678707
"original-wordmark",
86688708
"plain",
86698709
"plain-wordmark"
8670-
],
8710+
],
86718711
"font": [
86728712
"plain",
86738713
"plain-wordmark"
8674-
]
8714+
]
86758715
},
8676-
"color": "#f44250",
8677-
"aliases": []
8716+
"color": "#f44250",
8717+
"aliases": []
86788718
},
86798719
{
86808720
"name": "sequelize",
Lines changed: 1 addition & 0 deletions
Loading

icons/gradle/gradle-original.svg

Lines changed: 1 addition & 0 deletions
Loading

icons/gradle/gradle-plain-wordmark.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

icons/gradle/gradle-plain.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)