Skip to content

Commit 2adc92e

Browse files
authored
Merge branch 'develop' into feature/2346-proxmox
2 parents 4bfb9a5 + 8f8673e commit 2adc92e

30 files changed

Lines changed: 278 additions & 5 deletions

devicon.json

Lines changed: 249 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,28 @@
555555
}
556556
]
557557
},
558+
{
559+
"name": "apex",
560+
"altnames": [],
561+
"tags": [
562+
"language"
563+
],
564+
"versions": {
565+
"svg": [
566+
"original"
567+
],
568+
"font": [
569+
"original"
570+
]
571+
},
572+
"color": "#0d9dda",
573+
"aliases": [
574+
{
575+
"base": "original",
576+
"alias": "plain"
577+
}
578+
]
579+
},
558580
{
559581
"name": "apl",
560582
"altnames": [
@@ -2513,6 +2535,36 @@
25132535
"color": "#087cfa",
25142536
"aliases": []
25152537
},
2538+
{
2539+
"name": "datatables",
2540+
"altnames": [],
2541+
"tags": [
2542+
"css",
2543+
"framework",
2544+
"html",
2545+
"javascript",
2546+
"library"
2547+
],
2548+
"versions": {
2549+
"svg": [
2550+
"original"
2551+
],
2552+
"font": [
2553+
"original"
2554+
]
2555+
},
2556+
"color": "#ffffff",
2557+
"aliases": [
2558+
{
2559+
"base": "original",
2560+
"alias": "plain"
2561+
},
2562+
{
2563+
"base": "original",
2564+
"alias": "line"
2565+
}
2566+
]
2567+
},
25162568
{
25172569
"name": "dbeaver",
25182570
"altnames": [],
@@ -2953,6 +3005,34 @@
29533005
"color": "#0073BA",
29543006
"aliases": []
29553007
},
3008+
{
3009+
"name": "dyalog",
3010+
"altnames": [],
3011+
"tags": [
3012+
"language"
3013+
],
3014+
"versions": {
3015+
"svg": [
3016+
"original",
3017+
"original-wordmark"
3018+
],
3019+
"font": [
3020+
"original",
3021+
"original-wordmark"
3022+
]
3023+
},
3024+
"color": "#ff6600",
3025+
"aliases": [
3026+
{
3027+
"base": "original",
3028+
"alias": "plain"
3029+
},
3030+
{
3031+
"base": "original-wordmark",
3032+
"alias": "plain-wordmark"
3033+
}
3034+
]
3035+
},
29563036
{
29573037
"name": "dynamodb",
29583038
"altnames": [],
@@ -3514,11 +3594,11 @@
35143594
"base": "original",
35153595
"alias": "original-wordmark"
35163596
},
3517-
{
3597+
{
35183598
"base": "original",
35193599
"alias": "plain"
35203600
},
3521-
{
3601+
{
35223602
"base": "original",
35233603
"alias": "plain-wordmark"
35243604
}
@@ -4154,6 +4234,32 @@
41544234
"color": "#24292e",
41554235
"aliases": []
41564236
},
4237+
{
4238+
"name": "gitkraken",
4239+
"altnames": [],
4240+
"tags": [
4241+
"git",
4242+
"version-control"
4243+
],
4244+
"versions": {
4245+
"svg": [
4246+
"original",
4247+
"original-wordmark",
4248+
"plain-wordmark"
4249+
],
4250+
"font": [
4251+
"original",
4252+
"plain-wordmark"
4253+
]
4254+
},
4255+
"color": "#179287",
4256+
"aliases": [
4257+
{
4258+
"base": "original",
4259+
"alias": "plain"
4260+
}
4261+
]
4262+
},
41574263
{
41584264
"name": "gitlab",
41594265
"altnames": [],
@@ -4871,6 +4977,26 @@
48714977
"color": "#fbb040",
48724978
"aliases": []
48734979
},
4980+
{
4981+
"name": "hoppscotch",
4982+
"altnames": [],
4983+
"tags": [
4984+
"rest",
4985+
"testing",
4986+
"api"
4987+
],
4988+
"versions": {
4989+
"svg": [
4990+
"original",
4991+
"plain"
4992+
],
4993+
"font": [
4994+
"plain"
4995+
]
4996+
},
4997+
"color": "#00d196",
4998+
"aliases": []
4999+
},
48745000
{
48755001
"name": "html5",
48765002
"altnames": [
@@ -5014,6 +5140,7 @@
50145140
],
50155141
"versions": {
50165142
"svg": [
5143+
"original",
50175144
"plain",
50185145
"line"
50195146
],
@@ -5022,7 +5149,7 @@
50225149
"line"
50235150
]
50245151
},
5025-
"color": "#faa625",
5152+
"color": "#330000",
50265153
"aliases": []
50275154
},
50285155
{
@@ -5410,6 +5537,33 @@
54105537
"color": "#4285f4",
54115538
"aliases": []
54125539
},
5540+
{
5541+
"name": "jhipster",
5542+
"altnames": [],
5543+
"tags": [
5544+
"development",
5545+
"framework",
5546+
"java",
5547+
"platform",
5548+
"web",
5549+
"web-application",
5550+
"web-development"
5551+
],
5552+
"versions": {
5553+
"svg": [
5554+
"original",
5555+
"original-wordmark",
5556+
"plain",
5557+
"plain-wordmark"
5558+
],
5559+
"font": [
5560+
"plain",
5561+
"plain-wordmark"
5562+
]
5563+
},
5564+
"color": "#4289c7",
5565+
"aliases": []
5566+
},
54135567
{
54145568
"name": "jira",
54155569
"altnames": [
@@ -6263,6 +6417,28 @@
62636417
"color": "#000000",
62646418
"aliases": []
62656419
},
6420+
{
6421+
"name": "linuxmint",
6422+
"altnames": [],
6423+
"tags": [
6424+
"os",
6425+
"linux"
6426+
],
6427+
"versions": {
6428+
"svg": [
6429+
"original",
6430+
"original-wordmark",
6431+
"plain",
6432+
"plain-wordmark"
6433+
],
6434+
"font": [
6435+
"plain",
6436+
"plain-wordmark"
6437+
]
6438+
},
6439+
"color": "#69b53f",
6440+
"aliases": []
6441+
},
62666442
{
62676443
"name": "liquibase",
62686444
"altnames": [],
@@ -7638,6 +7814,29 @@
76387814
"color": "#76d04b",
76397815
"aliases": []
76407816
},
7817+
{
7818+
"name": "nodered",
7819+
"altnames": [
7820+
"node-red"
7821+
],
7822+
"tags": [
7823+
"programming",
7824+
"tool"
7825+
],
7826+
"versions": {
7827+
"svg": [
7828+
"original",
7829+
"plain",
7830+
"line"
7831+
],
7832+
"font": [
7833+
"plain",
7834+
"line"
7835+
]
7836+
},
7837+
"color": "#8f0000",
7838+
"aliases": []
7839+
},
76417840
{
76427841
"name": "nodewebkit",
76437842
"altnames": [
@@ -8884,6 +9083,28 @@
88849083
"color": "#2A0634",
88859084
"aliases": []
88869085
},
9086+
{
9087+
"name": "primeng",
9088+
"altnames": [],
9089+
"tags": [
9090+
"angular",
9091+
"ui",
9092+
"component",
9093+
"library",
9094+
"framework"
9095+
],
9096+
"versions": {
9097+
"svg": [
9098+
"original",
9099+
"plain"
9100+
],
9101+
"font": [
9102+
"plain"
9103+
]
9104+
},
9105+
"color": "#000",
9106+
"aliases": []
9107+
},
88879108
{
88889109
"name": "prisma",
88899110
"altnames": [],
@@ -13135,6 +13356,31 @@
1313513356
}
1313613357
]
1313713358
},
13359+
{
13360+
"name": "wolfram",
13361+
"altnames": [
13362+
"wolframlanguage"
13363+
],
13364+
"tags": [
13365+
"data-science",
13366+
"functional",
13367+
"programming"
13368+
],
13369+
"versions": {
13370+
"svg": [
13371+
"original",
13372+
"original-wordmark",
13373+
"plain",
13374+
"plain-wordmark"
13375+
],
13376+
"font": [
13377+
"plain",
13378+
"plain-wordmark"
13379+
]
13380+
},
13381+
"color": "#dd1100",
13382+
"aliases": []
13383+
},
1313813384
{
1313913385
"name": "woocommerce",
1314013386
"altnames": [],

icons/apex/apex-original.svg

Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

icons/dyalog/dyalog-original.svg

Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)