Skip to content

Commit e773639

Browse files
canalealcanaleal
authored
Merge branch 'develop' into new-icon-gardener
2 parents 9b6a9c3 + 4fe4251 commit e773639

35 files changed

Lines changed: 273 additions & 9 deletions

‎devicon.json‎

Lines changed: 241 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,36 @@
104104
}
105105
]
106106
},
107+
{
108+
"name": "aerospike",
109+
"altnames": [],
110+
"tags": [
111+
"data",
112+
"database",
113+
"nosql"
114+
],
115+
"versions": {
116+
"svg": [
117+
"original",
118+
"original-wordmark"
119+
],
120+
"font": [
121+
"original",
122+
"original-wordmark"
123+
]
124+
},
125+
"color": "#c21417",
126+
"aliases": [
127+
{
128+
"base": "original",
129+
"alias": "plain"
130+
},
131+
{
132+
"base": "original-wordmark",
133+
"alias": "plain-wordmark"
134+
}
135+
]
136+
},
107137
{
108138
"name": "aftereffects",
109139
"altnames": [
@@ -2526,6 +2556,34 @@
25262556
}
25272557
]
25282558
},
2559+
{
2560+
"name": "discloud",
2561+
"altnames": [],
2562+
"tags": [
2563+
"cloud",
2564+
"hosting",
2565+
"database",
2566+
"storage"
2567+
],
2568+
"versions": {
2569+
"svg": [
2570+
"original",
2571+
"original-wordmark",
2572+
"plain-wordmark"
2573+
],
2574+
"font": [
2575+
"original",
2576+
"plain-wordmark"
2577+
]
2578+
},
2579+
"color": "#57f287",
2580+
"aliases": [
2581+
{
2582+
"base": "original",
2583+
"alias": "plain"
2584+
}
2585+
]
2586+
},
25292587
{
25302588
"name": "discordjs",
25312589
"altnames": [],
@@ -4629,6 +4687,36 @@
46294687
"color": "#e54d26",
46304688
"aliases": []
46314689
},
4690+
{
4691+
"name": "htmx",
4692+
"altnames": [
4693+
"html ui framework"
4694+
],
4695+
"tags": [
4696+
"framework",
4697+
"web",
4698+
"html",
4699+
"ui"
4700+
],
4701+
"versions": {
4702+
"svg": [
4703+
"original",
4704+
"original-wordmark",
4705+
"plain",
4706+
"plain-wordmark",
4707+
"line",
4708+
"line-wordmark"
4709+
],
4710+
"font": [
4711+
"plain",
4712+
"plain-wordmark",
4713+
"line",
4714+
"line-wordmark"
4715+
]
4716+
},
4717+
"color": "#333333",
4718+
"aliases": []
4719+
},
46324720
{
46334721
"name": "hugo",
46344722
"altnames": [
@@ -5824,6 +5912,43 @@
58245912
"color": "#2a4d80",
58255913
"aliases": []
58265914
},
5915+
{
5916+
"name": "libgdx",
5917+
"altnames": [],
5918+
"tags": [
5919+
"framework",
5920+
"java",
5921+
"game-development",
5922+
"cross-platform",
5923+
"open-source"
5924+
],
5925+
"versions": {
5926+
"svg": [
5927+
"original",
5928+
"plain",
5929+
"line"
5930+
],
5931+
"font": [
5932+
"plain",
5933+
"line"
5934+
]
5935+
},
5936+
"color": "#e74a45",
5937+
"aliases": [
5938+
{
5939+
"base": "original",
5940+
"alias": "original-wordmark"
5941+
},
5942+
{
5943+
"base": "plain",
5944+
"alias": "plain-wordmark"
5945+
},
5946+
{
5947+
"base": "line",
5948+
"alias": "line-wordmark"
5949+
}
5950+
]
5951+
},
58275952
{
58285953
"name": "linkedin",
58295954
"altnames": [],
@@ -6794,6 +6919,29 @@
67946919
}
67956920
]
67966921
},
6922+
{
6923+
"name": "netbeans",
6924+
"altnames": [],
6925+
"tags": [
6926+
"ide",
6927+
"java",
6928+
"open-source"
6929+
],
6930+
"versions": {
6931+
"svg": [
6932+
"original",
6933+
"original-wordmark",
6934+
"plain",
6935+
"plain-wordmark"
6936+
],
6937+
"font": [
6938+
"plain",
6939+
"plain-wordmark"
6940+
]
6941+
},
6942+
"color": "#1e6abf",
6943+
"aliases": []
6944+
},
67976945
{
67986946
"name": "nginx",
67996947
"altnames": [],
@@ -7714,6 +7862,34 @@
77147862
"color": "#130754",
77157863
"aliases": []
77167864
},
7865+
{
7866+
"name": "passport",
7867+
"altnames": [
7868+
"passportjs"
7869+
],
7870+
"tags": [
7871+
"authentication",
7872+
"security"
7873+
],
7874+
"versions": {
7875+
"svg": [
7876+
"original",
7877+
"original-wordmark",
7878+
"plain"
7879+
],
7880+
"font": [
7881+
"plain",
7882+
"original-wordmark"
7883+
]
7884+
},
7885+
"color": "#35df79",
7886+
"aliases": [
7887+
{
7888+
"base": "original-wordmark",
7889+
"alias": "plain-wordmark"
7890+
}
7891+
]
7892+
},
77177893
{
77187894
"name": "perl",
77197895
"altnames": [],
@@ -8241,17 +8417,25 @@
82418417
"versions": {
82428418
"svg": [
82438419
"original",
8244-
"original-wordmark",
82458420
"plain",
8246-
"plain-wordmark"
8421+
"line"
82478422
],
82488423
"font": [
82498424
"plain",
8250-
"plain-wordmark"
8425+
"line"
82518426
]
82528427
},
8253-
"color": "#000000",
8254-
"aliases": []
8428+
"color": "#1f34ab",
8429+
"aliases": [
8430+
{
8431+
"base": "original",
8432+
"alias": "original-wordmark"
8433+
},
8434+
{
8435+
"base": "plain",
8436+
"alias": "plain-wordmark"
8437+
}
8438+
]
82558439
},
82568440
{
82578441
"name": "prolog",
@@ -11331,6 +11515,31 @@
1133111515
}
1133211516
]
1133311517
},
11518+
{
11519+
"name": "vaadin",
11520+
"altnames": [],
11521+
"tags": [
11522+
"framework",
11523+
"java",
11524+
"web"
11525+
],
11526+
"versions": {
11527+
"svg": [
11528+
"original",
11529+
"original-wordmark"
11530+
],
11531+
"font": [
11532+
"original"
11533+
]
11534+
},
11535+
"color": "#00b4f0",
11536+
"aliases": [
11537+
{
11538+
"base": "original",
11539+
"alias": "plain"
11540+
}
11541+
]
11542+
},
1133411543
{
1133511544
"name": "vagrant",
1133611545
"altnames": [],
@@ -11899,6 +12108,33 @@
1189912108
"color": "#4353ff",
1190012109
"aliases": []
1190112110
},
12111+
{
12112+
"name": "webgpu",
12113+
"altnames": [],
12114+
"tags": [
12115+
"graphics",
12116+
"framework",
12117+
"web"
12118+
],
12119+
"versions": {
12120+
"svg": [
12121+
"original",
12122+
"original-wordmark",
12123+
"plain",
12124+
"plain-wordmark",
12125+
"line",
12126+
"line-wordmark"
12127+
],
12128+
"font": [
12129+
"plain",
12130+
"plain-wordmark",
12131+
"line",
12132+
"line-wordmark"
12133+
]
12134+
},
12135+
"color": "#005a9c",
12136+
"aliases": []
12137+
},
1190212138
{
1190312139
"name": "weblate",
1190412140
"altnames": [],

‎icons/aerospike/aerospike-original-wordmark.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎icons/aerospike/aerospike-original.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎icons/discloud/discloud-original-wordmark.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎icons/discloud/discloud-original.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎icons/discloud/discloud-plain-wordmark.svg‎

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)