Skip to content

Commit 3e0bdab

Browse files
authored
Merge branch 'develop' into new-icon-netbeans
2 parents 3b11d73 + 61a9571 commit 3e0bdab

34 files changed

Lines changed: 260 additions & 75 deletions

bower.json

Lines changed: 0 additions & 25 deletions
This file was deleted.

devicon.json

Lines changed: 232 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,31 @@
172172
"color": "#003dff",
173173
"aliases": []
174174
},
175+
{
176+
"name": "almalinux",
177+
"altnames": [
178+
"AlmaLinux OS"
179+
],
180+
"tags": [
181+
"linux",
182+
"os",
183+
"open-source"
184+
],
185+
"versions": {
186+
"svg": [
187+
"original",
188+
"original-wordmark",
189+
"plain",
190+
"plain-wordmark"
191+
],
192+
"font": [
193+
"plain",
194+
"plain-wordmark"
195+
]
196+
},
197+
"color": "#ffffff",
198+
"aliases": []
199+
},
175200
{
176201
"name": "alpinejs",
177202
"altnames": [
@@ -770,6 +795,7 @@
770795
],
771796
"versions": {
772797
"svg": [
798+
"original",
773799
"original-wordmark",
774800
"plain-wordmark"
775801
],
@@ -780,11 +806,7 @@
780806
"color": "#0a094d",
781807
"aliases": [
782808
{
783-
"base": "original-wordmark",
784-
"alias": "original"
785-
},
786-
{
787-
"base": "plain-wordmark",
809+
"base": "original",
788810
"alias": "plain"
789811
}
790812
]
@@ -2422,6 +2444,32 @@
24222444
}
24232445
]
24242446
},
2447+
{
2448+
"name": "detaspace",
2449+
"altnames": [
2450+
"Deta",
2451+
"Deta Space"
2452+
],
2453+
"tags": [
2454+
"cloud",
2455+
"hosting",
2456+
"server"
2457+
],
2458+
"versions": {
2459+
"svg": [
2460+
"original",
2461+
"original-wordmark",
2462+
"line",
2463+
"line-wordmark"
2464+
],
2465+
"font": [
2466+
"line",
2467+
"line-wordmark"
2468+
]
2469+
},
2470+
"color": "#f73b95",
2471+
"aliases": []
2472+
},
24252473
{
24262474
"name": "devicon",
24272475
"altnames": [],
@@ -3188,6 +3236,43 @@
31883236
"color": "#294172",
31893237
"aliases": []
31903238
},
3239+
{
3240+
"name": "fiber",
3241+
"altnames": [
3242+
"GoFiber"
3243+
],
3244+
"tags": [
3245+
"framework",
3246+
"go",
3247+
"web"
3248+
],
3249+
"versions": {
3250+
"svg": [
3251+
"original",
3252+
"plain",
3253+
"line"
3254+
],
3255+
"font": [
3256+
"plain",
3257+
"line"
3258+
]
3259+
},
3260+
"color": "#00acd7",
3261+
"aliases": [
3262+
{
3263+
"base": "original",
3264+
"alias": "original-wordmark"
3265+
},
3266+
{
3267+
"base": "plain",
3268+
"alias": "plain-wordmark"
3269+
},
3270+
{
3271+
"base": "line",
3272+
"alias": "line-wordmark"
3273+
}
3274+
]
3275+
},
31913276
{
31923277
"name": "figma",
31933278
"altnames": [],
@@ -3206,6 +3291,37 @@
32063291
"color": "#f24e1e",
32073292
"aliases": []
32083293
},
3294+
{
3295+
"name": "filamentphp",
3296+
"altnames": [],
3297+
"tags": [
3298+
"framework",
3299+
"laravel"
3300+
],
3301+
"versions": {
3302+
"svg": [
3303+
"original"
3304+
],
3305+
"font": [
3306+
"original"
3307+
]
3308+
},
3309+
"color": "#000000",
3310+
"aliases": [
3311+
{
3312+
"base": "original",
3313+
"alias": "original-wordmark"
3314+
},
3315+
{
3316+
"base": "original",
3317+
"alias": "plain"
3318+
},
3319+
{
3320+
"base": "original",
3321+
"alias": "plain-wordmark"
3322+
}
3323+
]
3324+
},
32093325
{
32103326
"name": "filezilla",
32113327
"altnames": [],
@@ -3962,6 +4078,31 @@
39624078
"color": "#557ebf",
39634079
"aliases": []
39644080
},
4081+
{
4082+
"name": "googlecolab",
4083+
"altnames": [
4084+
"googlecolaboratory"
4085+
],
4086+
"tags": [
4087+
"cloud-computing-platform",
4088+
"data science",
4089+
"google",
4090+
"machine-learning",
4091+
"python",
4092+
"virtual machine"
4093+
],
4094+
"versions": {
4095+
"svg": [
4096+
"original",
4097+
"plain"
4098+
],
4099+
"font": [
4100+
"plain"
4101+
]
4102+
},
4103+
"color": "#ffb300",
4104+
"aliases": []
4105+
},
39654106
{
39664107
"name": "gradle",
39674108
"altnames": [
@@ -6685,6 +6826,43 @@
66856826
}
66866827
]
66876828
},
6829+
{
6830+
"name": "ngrok",
6831+
"altnames": [],
6832+
"tags": [
6833+
"networking",
6834+
"server"
6835+
],
6836+
"versions": {
6837+
"svg": [
6838+
"original",
6839+
"line"
6840+
],
6841+
"font": [
6842+
"original",
6843+
"line"
6844+
]
6845+
},
6846+
"color": "#02228e",
6847+
"aliases": [
6848+
{
6849+
"base": "original",
6850+
"alias": "original-wordmark"
6851+
},
6852+
{
6853+
"base": "original",
6854+
"alias": "plain"
6855+
},
6856+
{
6857+
"base": "original",
6858+
"alias": "plain-wordmark"
6859+
},
6860+
{
6861+
"base": "line",
6862+
"alias": "line-wordmark"
6863+
}
6864+
]
6865+
},
66886866
{
66896867
"name": "ngrx",
66906868
"altnames": [],
@@ -6704,7 +6882,7 @@
67046882
"plain"
67056883
]
67066884
},
6707-
"color": "#412846",
6885+
"color": "#ba2bd2",
67086886
"aliases": []
67096887
},
67106888
{
@@ -6964,10 +7142,14 @@
69647142
],
69657143
"versions": {
69667144
"svg": [
6967-
"original-wordmark"
7145+
"original",
7146+
"original-wordmark",
7147+
"plain"
69687148
],
69697149
"font": [
6970-
"original-wordmark"
7150+
"original",
7151+
"original-wordmark",
7152+
"plain"
69717153
]
69727154
},
69737155
"color": "#cb3837",
@@ -10315,6 +10497,29 @@
1031510497
"color": "#3ecf8e",
1031610498
"aliases": []
1031710499
},
10500+
{
10501+
"name": "surrealdb",
10502+
"altnames": [],
10503+
"tags": [
10504+
"db",
10505+
"database",
10506+
"storage"
10507+
],
10508+
"versions": {
10509+
"svg": [
10510+
"original",
10511+
"original-wordmark",
10512+
"plain",
10513+
"plain-wordmark"
10514+
],
10515+
"font": [
10516+
"plain",
10517+
"plain-wordmark"
10518+
]
10519+
},
10520+
"color": "#c900d1",
10521+
"aliases": []
10522+
},
1031810523
{
1031910524
"name": "svelte",
1032010525
"altnames": [
@@ -11598,26 +11803,33 @@
1159811803
"vyperlang"
1159911804
],
1160011805
"tags": [
11601-
"programming",
11602-
"language",
11603-
"python",
1160411806
"blockchain",
11605-
"ethereum"
11807+
"ethereum",
11808+
"language",
11809+
"programming",
11810+
"python"
1160611811
],
1160711812
"versions": {
1160811813
"svg": [
1160911814
"original",
11610-
"original-wordmark",
11611-
"plain",
11612-
"plain-wordmark"
11815+
"original-wordmark"
1161311816
],
1161411817
"font": [
11615-
"plain",
11616-
"plain-wordmark"
11818+
"original",
11819+
"original-wordmark"
1161711820
]
1161811821
},
11619-
"color": "#000000",
11620-
"aliases": []
11822+
"color": "#9F4CF2",
11823+
"aliases": [
11824+
{
11825+
"base": "original",
11826+
"alias": "plain"
11827+
},
11828+
{
11829+
"base": "original-wordmark",
11830+
"alias": "plain-wordmark"
11831+
}
11832+
]
1162111833
},
1162211834
{
1162311835
"name": "wasm",
@@ -12165,4 +12377,4 @@
1216512377
}
1216612378
]
1216712379
}
12168-
]
12380+
]
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)