Skip to content

Commit 10ebf3a

Browse files
authored
Merge branch 'develop' into styledcomponents
2 parents 53c6040 + c2f7a46 commit 10ebf3a

15 files changed

Lines changed: 138 additions & 0 deletions

devicon.json

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2535,6 +2535,36 @@
25352535
"color": "#087cfa",
25362536
"aliases": []
25372537
},
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+
},
25382568
{
25392569
"name": "dbeaver",
25402570
"altnames": [],
@@ -4316,6 +4346,27 @@
43164346
"color": "#ffaff3",
43174347
"aliases": []
43184348
},
4349+
{
4350+
"name": "glitch",
4351+
"altnames": [],
4352+
"tags": [
4353+
"web-apps",
4354+
"online-platform",
4355+
"programming-environment",
4356+
"collaborative-environment"
4357+
],
4358+
"versions": {
4359+
"svg": [
4360+
"original",
4361+
"plain"
4362+
],
4363+
"font": [
4364+
"plain"
4365+
]
4366+
},
4367+
"color": "#000000",
4368+
"aliases": []
4369+
},
43194370
{
43204371
"name": "go",
43214372
"altnames": [
@@ -5507,6 +5558,33 @@
55075558
"color": "#4285f4",
55085559
"aliases": []
55095560
},
5561+
{
5562+
"name": "jhipster",
5563+
"altnames": [],
5564+
"tags": [
5565+
"development",
5566+
"framework",
5567+
"java",
5568+
"platform",
5569+
"web",
5570+
"web-application",
5571+
"web-development"
5572+
],
5573+
"versions": {
5574+
"svg": [
5575+
"original",
5576+
"original-wordmark",
5577+
"plain",
5578+
"plain-wordmark"
5579+
],
5580+
"font": [
5581+
"plain",
5582+
"plain-wordmark"
5583+
]
5584+
},
5585+
"color": "#4289c7",
5586+
"aliases": []
5587+
},
55105588
{
55115589
"name": "jira",
55125590
"altnames": [
@@ -7757,6 +7835,29 @@
77577835
"color": "#76d04b",
77587836
"aliases": []
77597837
},
7838+
{
7839+
"name": "nodered",
7840+
"altnames": [
7841+
"node-red"
7842+
],
7843+
"tags": [
7844+
"programming",
7845+
"tool"
7846+
],
7847+
"versions": {
7848+
"svg": [
7849+
"original",
7850+
"plain",
7851+
"line"
7852+
],
7853+
"font": [
7854+
"plain",
7855+
"line"
7856+
]
7857+
},
7858+
"color": "#8f0000",
7859+
"aliases": []
7860+
},
77607861
{
77617862
"name": "nodewebkit",
77627863
"altnames": [
@@ -9205,6 +9306,29 @@
92059306
"color": "#d51c2f",
92069307
"aliases": []
92079308
},
9309+
{
9310+
"name": "proxmox",
9311+
"altnames": [],
9312+
"tags": [
9313+
"container",
9314+
"lxc",
9315+
"virtual machine"
9316+
],
9317+
"versions": {
9318+
"svg": [
9319+
"original",
9320+
"original-wordmark",
9321+
"plain",
9322+
"plain-wordmark"
9323+
],
9324+
"font": [
9325+
"plain",
9326+
"plain-wordmark"
9327+
]
9328+
},
9329+
"color": "#e57000",
9330+
"aliases": []
9331+
},
92089332
{
92099333
"name": "pulsar",
92109334
"altnames": [
Lines changed: 1 addition & 0 deletions
Loading

icons/glitch/glitch-original.svg

Lines changed: 1 addition & 0 deletions
Loading

icons/glitch/glitch-plain.svg

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)