Skip to content

Commit e275eae

Browse files
authored
Merge branch 'develop' into new-icon-aerospike
2 parents a2baad7 + f2dd530 commit e275eae

22 files changed

+154
-0
lines changed

devicon.json

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2556,6 +2556,34 @@
25562556
}
25572557
]
25582558
},
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+
},
25592587
{
25602588
"name": "discordjs",
25612589
"altnames": [],
@@ -4638,6 +4666,36 @@
46384666
"color": "#e54d26",
46394667
"aliases": []
46404668
},
4669+
{
4670+
"name": "htmx",
4671+
"altnames": [
4672+
"html ui framework"
4673+
],
4674+
"tags": [
4675+
"framework",
4676+
"web",
4677+
"html",
4678+
"ui"
4679+
],
4680+
"versions": {
4681+
"svg": [
4682+
"original",
4683+
"original-wordmark",
4684+
"plain",
4685+
"plain-wordmark",
4686+
"line",
4687+
"line-wordmark"
4688+
],
4689+
"font": [
4690+
"plain",
4691+
"plain-wordmark",
4692+
"line",
4693+
"line-wordmark"
4694+
]
4695+
},
4696+
"color": "#333333",
4697+
"aliases": []
4698+
},
46414699
{
46424700
"name": "hugo",
46434701
"altnames": [
@@ -6803,6 +6861,29 @@
68036861
}
68046862
]
68056863
},
6864+
{
6865+
"name": "netbeans",
6866+
"altnames": [],
6867+
"tags": [
6868+
"ide",
6869+
"java",
6870+
"open-source"
6871+
],
6872+
"versions": {
6873+
"svg": [
6874+
"original",
6875+
"original-wordmark",
6876+
"plain",
6877+
"plain-wordmark"
6878+
],
6879+
"font": [
6880+
"plain",
6881+
"plain-wordmark"
6882+
]
6883+
},
6884+
"color": "#1e6abf",
6885+
"aliases": []
6886+
},
68066887
{
68076888
"name": "nginx",
68086889
"altnames": [],
@@ -11340,6 +11421,31 @@
1134011421
}
1134111422
]
1134211423
},
11424+
{
11425+
"name": "vaadin",
11426+
"altnames": [],
11427+
"tags": [
11428+
"framework",
11429+
"java",
11430+
"web"
11431+
],
11432+
"versions": {
11433+
"svg": [
11434+
"original",
11435+
"original-wordmark"
11436+
],
11437+
"font": [
11438+
"original"
11439+
]
11440+
},
11441+
"color": "#00b4f0",
11442+
"aliases": [
11443+
{
11444+
"base": "original",
11445+
"alias": "plain"
11446+
}
11447+
]
11448+
},
1134311449
{
1134411450
"name": "vagrant",
1134511451
"altnames": [],
@@ -11908,6 +12014,33 @@
1190812014
"color": "#4353ff",
1190912015
"aliases": []
1191012016
},
12017+
{
12018+
"name": "webgpu",
12019+
"altnames": [],
12020+
"tags": [
12021+
"graphics",
12022+
"framework",
12023+
"web"
12024+
],
12025+
"versions": {
12026+
"svg": [
12027+
"original",
12028+
"original-wordmark",
12029+
"plain",
12030+
"plain-wordmark",
12031+
"line",
12032+
"line-wordmark"
12033+
],
12034+
"font": [
12035+
"plain",
12036+
"plain-wordmark",
12037+
"line",
12038+
"line-wordmark"
12039+
]
12040+
},
12041+
"color": "#005a9c",
12042+
"aliases": []
12043+
},
1191112044
{
1191212045
"name": "weblate",
1191312046
"altnames": [],
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

icons/htmx/htmx-line-wordmark.svg

Lines changed: 1 addition & 0 deletions
Loading

icons/htmx/htmx-line.svg

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)