Skip to content

Commit

Permalink
Merge branch 'develop' into new-icon-aerospike
Browse files Browse the repository at this point in the history
  • Loading branch information
canaleal authored Nov 10, 2024
2 parents a2baad7 + f2dd530 commit e275eae
Show file tree
Hide file tree
Showing 22 changed files with 154 additions and 0 deletions.
133 changes: 133 additions & 0 deletions devicon.json
Original file line number Diff line number Diff line change
Expand Up @@ -2556,6 +2556,34 @@
}
]
},
{
"name": "discloud",
"altnames": [],
"tags": [
"cloud",
"hosting",
"database",
"storage"
],
"versions": {
"svg": [
"original",
"original-wordmark",
"plain-wordmark"
],
"font": [
"original",
"plain-wordmark"
]
},
"color": "#57f287",
"aliases": [
{
"base": "original",
"alias": "plain"
}
]
},
{
"name": "discordjs",
"altnames": [],
Expand Down Expand Up @@ -4638,6 +4666,36 @@
"color": "#e54d26",
"aliases": []
},
{
"name": "htmx",
"altnames": [
"html ui framework"
],
"tags": [
"framework",
"web",
"html",
"ui"
],
"versions": {
"svg": [
"original",
"original-wordmark",
"plain",
"plain-wordmark",
"line",
"line-wordmark"
],
"font": [
"plain",
"plain-wordmark",
"line",
"line-wordmark"
]
},
"color": "#333333",
"aliases": []
},
{
"name": "hugo",
"altnames": [
Expand Down Expand Up @@ -6803,6 +6861,29 @@
}
]
},
{
"name": "netbeans",
"altnames": [],
"tags": [
"ide",
"java",
"open-source"
],
"versions": {
"svg": [
"original",
"original-wordmark",
"plain",
"plain-wordmark"
],
"font": [
"plain",
"plain-wordmark"
]
},
"color": "#1e6abf",
"aliases": []
},
{
"name": "nginx",
"altnames": [],
Expand Down Expand Up @@ -11340,6 +11421,31 @@
}
]
},
{
"name": "vaadin",
"altnames": [],
"tags": [
"framework",
"java",
"web"
],
"versions": {
"svg": [
"original",
"original-wordmark"
],
"font": [
"original"
]
},
"color": "#00b4f0",
"aliases": [
{
"base": "original",
"alias": "plain"
}
]
},
{
"name": "vagrant",
"altnames": [],
Expand Down Expand Up @@ -11908,6 +12014,33 @@
"color": "#4353ff",
"aliases": []
},
{
"name": "webgpu",
"altnames": [],
"tags": [
"graphics",
"framework",
"web"
],
"versions": {
"svg": [
"original",
"original-wordmark",
"plain",
"plain-wordmark",
"line",
"line-wordmark"
],
"font": [
"plain",
"plain-wordmark",
"line",
"line-wordmark"
]
},
"color": "#005a9c",
"aliases": []
},
{
"name": "weblate",
"altnames": [],
Expand Down
1 change: 1 addition & 0 deletions icons/discloud/discloud-original-wordmark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/discloud/discloud-original.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/discloud/discloud-plain-wordmark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/htmx/htmx-line-wordmark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/htmx/htmx-line.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit e275eae

Please sign in to comment.