Skip to content

Commit 4579504

Browse files
authored
Merge branch 'develop' into dyalog
2 parents df76c38 + 42f4e92 commit 4579504

File tree

3 files changed

+112
-110
lines changed

3 files changed

+112
-110
lines changed

devicon.json

Lines changed: 110 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,12 @@
8989
"color": "#c21417",
9090
"aliases": [
9191
{
92-
"base": "original",
93-
"alias": "plain"
92+
"base": "original",
93+
"alias": "plain"
9494
},
9595
{
96-
"base": "original-wordmark",
97-
"alias": "plain-wordmark"
96+
"base": "original-wordmark",
97+
"alias": "plain-wordmark"
9898
}
9999
]
100100
},
@@ -124,8 +124,8 @@
124124
"color": "#ee295f",
125125
"aliases": [
126126
{
127-
"base": "original-wordmark",
128-
"alias": "plain-wordmark"
127+
"base": "original-wordmark",
128+
"alias": "plain-wordmark"
129129
}
130130
]
131131
},
@@ -1863,50 +1863,50 @@
18631863
"aliases": []
18641864
},
18651865
{
1866-
"name": "clion",
1866+
"name": "clickhouse",
18671867
"altnames": [],
18681868
"tags": [
1869-
"jetbrains",
1870-
"editor",
1871-
"c",
1872-
"c++",
1873-
"cpp",
1874-
"cplusplus"
1869+
"cloud",
1870+
"column-oriented",
1871+
"database",
1872+
"warehouse"
18751873
],
18761874
"versions": {
18771875
"svg": [
18781876
"original",
1879-
"original-wordmark",
1880-
"plain",
1881-
"plain-wordmark"
1877+
"plain"
18821878
],
18831879
"font": [
1884-
"plain",
1885-
"plain-wordmark"
1880+
"plain"
18861881
]
18871882
},
1888-
"color": "#21d789",
1883+
"color": "#f9ff69",
18891884
"aliases": []
18901885
},
18911886
{
1892-
"name": "clickhouse",
1887+
"name": "clion",
18931888
"altnames": [],
18941889
"tags": [
1895-
"cloud",
1896-
"column-oriented",
1897-
"database",
1898-
"warehouse"
1890+
"jetbrains",
1891+
"editor",
1892+
"c",
1893+
"c++",
1894+
"cpp",
1895+
"cplusplus"
18991896
],
19001897
"versions": {
19011898
"svg": [
19021899
"original",
1903-
"plain"
1900+
"original-wordmark",
1901+
"plain",
1902+
"plain-wordmark"
19041903
],
19051904
"font": [
1906-
"plain"
1905+
"plain",
1906+
"plain-wordmark"
19071907
]
19081908
},
1909-
"color": "#f9ff69",
1909+
"color": "#21d789",
19101910
"aliases": []
19111911
},
19121912
{
@@ -7037,10 +7037,12 @@
70377037
"versions": {
70387038
"svg": [
70397039
"original",
7040-
"plain"
7040+
"plain",
7041+
"line"
70417042
],
70427043
"font": [
7043-
"plain"
7044+
"plain",
7045+
"line"
70447046
]
70457047
},
70467048
"color": "#5A90B6",
@@ -7087,7 +7089,7 @@
70877089
"color": "#fec514",
70887090
"aliases": []
70897091
},
7090-
{
7092+
{
70917093
"name": "love2d",
70927094
"altnames": [
70937095
"löve"
@@ -8009,6 +8011,57 @@
80098011
}
80108012
]
80118013
},
8014+
{
8015+
"name": "netbeans",
8016+
"altnames": [],
8017+
"tags": [
8018+
"ide",
8019+
"java",
8020+
"open-source"
8021+
],
8022+
"versions": {
8023+
"svg": [
8024+
"original",
8025+
"original-wordmark",
8026+
"plain",
8027+
"plain-wordmark"
8028+
],
8029+
"font": [
8030+
"plain",
8031+
"plain-wordmark"
8032+
]
8033+
},
8034+
"color": "#1e6abf",
8035+
"aliases": []
8036+
},
8037+
{
8038+
"name": "netbox",
8039+
"altnames": [],
8040+
"tags": [
8041+
"network",
8042+
"automation",
8043+
"infrastructure",
8044+
"open-source"
8045+
],
8046+
"versions": {
8047+
"svg": [
8048+
"original",
8049+
"original-wordmark",
8050+
"plain",
8051+
"plain-wordmark",
8052+
"line",
8053+
"line-wordmark"
8054+
],
8055+
"font": [
8056+
"plain",
8057+
"plain-wordmark",
8058+
"line",
8059+
"line-wordmark"
8060+
]
8061+
},
8062+
"color": "#00857d",
8063+
"aliases": []
8064+
},
80128065
{
80138066
"name": "netlify",
80148067
"altnames": [],
@@ -8125,57 +8178,6 @@
81258178
}
81268179
]
81278180
},
8128-
{
8129-
"name": "netbeans",
8130-
"altnames": [],
8131-
"tags": [
8132-
"ide",
8133-
"java",
8134-
"open-source"
8135-
],
8136-
"versions": {
8137-
"svg": [
8138-
"original",
8139-
"original-wordmark",
8140-
"plain",
8141-
"plain-wordmark"
8142-
],
8143-
"font": [
8144-
"plain",
8145-
"plain-wordmark"
8146-
]
8147-
},
8148-
"color": "#1e6abf",
8149-
"aliases": []
8150-
},
8151-
{
8152-
"name": "netbox",
8153-
"altnames": [],
8154-
"tags": [
8155-
"network",
8156-
"automation",
8157-
"infrastructure",
8158-
"open-source"
8159-
],
8160-
"versions": {
8161-
"svg": [
8162-
"original",
8163-
"original-wordmark",
8164-
"plain",
8165-
"plain-wordmark",
8166-
"line",
8167-
"line-wordmark"
8168-
],
8169-
"font": [
8170-
"plain",
8171-
"plain-wordmark",
8172-
"line",
8173-
"line-wordmark"
8174-
]
8175-
},
8176-
"color": "#00857d",
8177-
"aliases": []
8178-
},
81798181
{
81808182
"name": "nginx",
81818183
"altnames": [],
@@ -8418,7 +8420,7 @@
84188420
{
84198421
"name": "nodered",
84208422
"altnames": [
8421-
"node-red"
8423+
"node-red"
84228424
],
84238425
"tags": [
84248426
"programming",
@@ -9796,8 +9798,7 @@
97969798
"php",
97979799
"framework"
97989800
],
9799-
"versions":
9800-
{
9801+
"versions": {
98019802
"svg": [
98029803
"original",
98039804
"original-wordmark",
@@ -10609,27 +10610,6 @@
1060910610
}
1061010611
]
1061110612
},
10612-
{
10613-
"name": "reactnative",
10614-
"altnames": [
10615-
"react-native"
10616-
],
10617-
"tags": [
10618-
"framework"
10619-
],
10620-
"versions": {
10621-
"svg": [
10622-
"original",
10623-
"original-wordmark"
10624-
],
10625-
"font": [
10626-
"original",
10627-
"original-wordmark"
10628-
]
10629-
},
10630-
"color": "#61dafb",
10631-
"aliases": []
10632-
},
1063310613
{
1063410614
"name": "reactbootstrap",
1063510615
"altnames": [
@@ -10659,6 +10639,27 @@
1065910639
}
1066010640
]
1066110641
},
10642+
{
10643+
"name": "reactnative",
10644+
"altnames": [
10645+
"react-native"
10646+
],
10647+
"tags": [
10648+
"framework"
10649+
],
10650+
"versions": {
10651+
"svg": [
10652+
"original",
10653+
"original-wordmark"
10654+
],
10655+
"font": [
10656+
"original",
10657+
"original-wordmark"
10658+
]
10659+
},
10660+
"color": "#61dafb",
10661+
"aliases": []
10662+
},
1066210663
{
1066310664
"name": "reactnavigation",
1066410665
"altnames": [],
@@ -14168,7 +14169,7 @@
1416814169
"aliases": []
1416914170
},
1417014171
{
14171-
"name": "windows8",
14172+
"name": "windows11",
1417214173
"altnames": [],
1417314174
"tags": [
1417414175
"os"
@@ -14183,7 +14184,7 @@
1418314184
"original-wordmark"
1418414185
]
1418514186
},
14186-
"color": "#00adef",
14187+
"color": "#0078d4",
1418714188
"aliases": [
1418814189
{
1418914190
"base": "original",
@@ -14196,7 +14197,7 @@
1419614197
]
1419714198
},
1419814199
{
14199-
"name": "windows11",
14200+
"name": "windows8",
1420014201
"altnames": [],
1420114202
"tags": [
1420214203
"os"
@@ -14211,7 +14212,7 @@
1421114212
"original-wordmark"
1421214213
]
1421314214
},
14214-
"color": "#0078d4",
14215+
"color": "#00adef",
1421514216
"aliases": [
1421614217
{
1421714218
"base": "original",

icons/llvm/llvm-line.svg

Lines changed: 1 addition & 0 deletions
Loading

icons/llvm/llvm-plain.svg

Lines changed: 1 addition & 1 deletion
Loading

0 commit comments

Comments
 (0)