Skip to content

Commit 55ac252

Browse files
authored
Merge branch 'develop' into new-icon-memcached
2 parents 6e3e7fe + 8c64cd4 commit 55ac252

25 files changed

Lines changed: 153 additions & 2186 deletions

devicon.json

Lines changed: 132 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -639,23 +639,18 @@
639639
"svg": [
640640
"original",
641641
"original-wordmark",
642-
"plain",
643642
"plain-wordmark"
644643
],
645644
"font": [
646-
"plain",
645+
"original",
647646
"plain-wordmark"
648647
]
649648
},
650-
"color": "#f02e65",
649+
"color": "#fd366e",
651650
"aliases": [
652651
{
653-
"base": "plain",
654-
"alias": "original"
655-
},
656-
{
657-
"base": "plain-wordmark",
658-
"alias": "original-wordmark"
652+
"base": "original",
653+
"alias": "plain"
659654
}
660655
]
661656
},
@@ -726,6 +721,32 @@
726721
"color": "#ef7b4d",
727722
"aliases": []
728723
},
724+
{
725+
"name": "artixlinux",
726+
"altnames": [
727+
"artix"
728+
],
729+
"tags": [
730+
"linux",
731+
"os",
732+
"distribution",
733+
"desktop"
734+
],
735+
"versions": {
736+
"svg": [
737+
"original",
738+
"original-wordmark",
739+
"plain",
740+
"plain-wordmark"
741+
],
742+
"font": [
743+
"plain",
744+
"plain-wordmark"
745+
]
746+
},
747+
"color": "#10a0cc",
748+
"aliases": []
749+
},
729750
{
730751
"name": "astro",
731752
"altnames": [],
@@ -3478,6 +3499,24 @@
34783499
"color": "#ffa000",
34793500
"aliases": []
34803501
},
3502+
{
3503+
"name": "firebird",
3504+
"altnames": [],
3505+
"tags": [
3506+
"database"
3507+
],
3508+
"versions": {
3509+
"svg": [
3510+
"original",
3511+
"plain"
3512+
],
3513+
"font": [
3514+
"plain"
3515+
]
3516+
},
3517+
"color": "#f4790e",
3518+
"aliases": []
3519+
},
34813520
{
34823521
"name": "firefox",
34833522
"altnames": [
@@ -8298,6 +8337,33 @@
82988337
"color": "#b74af7",
82998338
"aliases": []
83008339
},
8340+
{
8341+
"name": "pixijs",
8342+
"altnames": [],
8343+
"tags": [
8344+
"animation",
8345+
"graphics",
8346+
"html",
8347+
"javascript",
8348+
"library",
8349+
"visualization",
8350+
"ui"
8351+
],
8352+
"versions": {
8353+
"svg": [
8354+
"original",
8355+
"original-wordmark",
8356+
"plain",
8357+
"plain-wordmark"
8358+
],
8359+
"font": [
8360+
"plain",
8361+
"plain-wordmark"
8362+
]
8363+
},
8364+
"color": "#e72264",
8365+
"aliases": []
8366+
},
83018367
{
83028368
"name": "playwright",
83038369
"altnames": [],
@@ -9375,6 +9441,27 @@
93759441
}
93769442
]
93779443
},
9444+
{
9445+
"name": "reactnative",
9446+
"altnames": [
9447+
"react-native"
9448+
],
9449+
"tags": [
9450+
"framework"
9451+
],
9452+
"versions": {
9453+
"svg": [
9454+
"original",
9455+
"original-wordmark"
9456+
],
9457+
"font": [
9458+
"original",
9459+
"original-wordmark"
9460+
]
9461+
},
9462+
"color": "#61dafb",
9463+
"aliases": []
9464+
},
93789465
{
93799466
"name": "reactbootstrap",
93809467
"altnames": [
@@ -11225,6 +11312,42 @@
1122511312
"color": "#FFC131",
1122611313
"aliases": []
1122711314
},
11315+
{
11316+
"name": "teleport",
11317+
"altnames": [],
11318+
"tags": [
11319+
"ssh",
11320+
"security",
11321+
"auth",
11322+
"authentication",
11323+
"infrastructure"
11324+
],
11325+
"versions": {
11326+
"svg": [
11327+
"original",
11328+
"original-wordmark",
11329+
"line",
11330+
"line-wordmark"
11331+
],
11332+
"font": [
11333+
"original",
11334+
"original-wordmark",
11335+
"line",
11336+
"line-wordmark"
11337+
]
11338+
},
11339+
"color": "#512fc9",
11340+
"aliases": [
11341+
{
11342+
"base": "original",
11343+
"alias": "plain"
11344+
},
11345+
{
11346+
"base": "original-wordmark",
11347+
"alias": "plain-wordmark"
11348+
}
11349+
]
11350+
},
1122811351
{
1122911352
"name": "tensorflow",
1123011353
"altnames": [],
Lines changed: 1 addition & 1 deletion
Loading
Lines changed: 1 addition & 1 deletion
Loading

0 commit comments

Comments
 (0)