Skip to content

Commit bcba343

Browse files
authored
Merge branch 'develop' into develop
2 parents cd348b6 + 0565962 commit bcba343

20 files changed

Lines changed: 120 additions & 13 deletions

devicon.json

Lines changed: 103 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1534,17 +1534,14 @@
15341534
"versions": {
15351535
"svg": [
15361536
"original",
1537-
"plain",
15381537
"line"
15391538
],
15401539
"font": [
1541-
"plain",
1542-
"plain-wordmark",
1543-
"line",
1544-
"line-wordmark"
1540+
"original",
1541+
"line"
15451542
]
15461543
},
1547-
"color": "#03599c",
1544+
"color": "#a9bacd",
15481545
"aliases": [
15491546
{
15501547
"base": "plain",
@@ -2416,6 +2413,37 @@
24162413
"color": "#e42528",
24172414
"aliases": []
24182415
},
2416+
{
2417+
"name": "cpanel",
2418+
"altnames": [],
2419+
"tags": [
2420+
"hosting",
2421+
"web hosting",
2422+
"server",
2423+
"control panel"
2424+
],
2425+
"versions": {
2426+
"svg": [
2427+
"original",
2428+
"original-wordmark"
2429+
],
2430+
"font": [
2431+
"original",
2432+
"original-wordmark"
2433+
]
2434+
},
2435+
"color": "#ff6c2c",
2436+
"aliases": [
2437+
{
2438+
"base": "original",
2439+
"alias": "plain"
2440+
},
2441+
{
2442+
"base": "original-wordmark",
2443+
"alias": "plain-wordmark"
2444+
}
2445+
]
2446+
},
24192447
{
24202448
"name": "cplusplus",
24212449
"altnames": [
@@ -2776,6 +2804,26 @@
27762804
"color": "#A80030",
27772805
"aliases": []
27782806
},
2807+
{
2808+
"name": "delphi",
2809+
"altnames": [
2810+
"embarcadero"
2811+
],
2812+
"tags": [
2813+
"language"
2814+
],
2815+
"versions": {
2816+
"svg": [
2817+
"original",
2818+
"plain"
2819+
],
2820+
"font": [
2821+
"plain"
2822+
]
2823+
},
2824+
"color": "#a81c21",
2825+
"aliases": []
2826+
},
27792827
{
27802828
"name": "denojs",
27812829
"altnames": [],
@@ -9854,6 +9902,30 @@
98549902
"color": "#e57000",
98559903
"aliases": []
98569904
},
9905+
{
9906+
"name": "pug",
9907+
"altnames": [
9908+
"pugjs"
9909+
],
9910+
"tags": [
9911+
"framework",
9912+
"javascript",
9913+
"nodejs"
9914+
],
9915+
"versions": {
9916+
"svg": [
9917+
"original",
9918+
"plain",
9919+
"line"
9920+
],
9921+
"font": [
9922+
"plain",
9923+
"line"
9924+
]
9925+
},
9926+
"color": "#56332b",
9927+
"aliases": []
9928+
},
98579929
{
98589930
"name": "pulsar",
98599931
"altnames": [
@@ -11671,6 +11743,31 @@
1167111743
}
1167211744
]
1167311745
},
11746+
{
11747+
"name": "sourceengine",
11748+
"altnames": [
11749+
"source engine"
11750+
],
11751+
"tags": [
11752+
"game-engine",
11753+
"valve",
11754+
"javascript"
11755+
],
11756+
"versions": {
11757+
"svg": [
11758+
"original",
11759+
"plain",
11760+
"original-wordmark",
11761+
"plain-wordmark"
11762+
],
11763+
"font": [
11764+
"plain",
11765+
"plain-wordmark"
11766+
]
11767+
},
11768+
"color": "#f79a10",
11769+
"aliases": []
11770+
},
1167411771
{
1167511772
"name": "sourcetree",
1167611773
"altnames": [],

icons/c/c-line.svg

Lines changed: 1 addition & 1 deletion
Loading

icons/c/c-original.svg

Lines changed: 1 addition & 1 deletion
Loading

icons/c/c-plain.svg

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

icons/c/c.eps

-497 KB
Binary file not shown.
Lines changed: 1 addition & 0 deletions
Loading

icons/cpanel/cpanel-original.svg

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)