Merge build-integrate with updated master #276
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lacking font
add codepen
new icon: Codepen (original, plain, wordmark)
…-codepen generate font including 'codepen' icon
…ns to prepare for use as font; adding haskell to devicon.json and devicon-colors.css
New Icon: Haskell (original, plain, wordmark) (fixes #274)
Create issue templates
Create CODE_OF_CONDUCT.md
Thomas-Boi
approved these changes
Sep 2, 2020
Member
Thomas-Boi
left a comment
Thomas-Boi
left a comment
There was a problem hiding this comment.
These commits look good to me, I'll merge them.
GCHQDeveloper926
pushed a commit
to GCHQDeveloper926/devicon
that referenced
this pull request
Dec 20, 2024
…aster Merge build-integrate with updated master
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since some time has passed (and some commits were made) after @Thomas-Boi created the
build-integratebranch I decided to merge themasterbranch back into thebuild-integratebranch resolving some conflicts (regarding the haskell icons).Hope you will find this useful @Thomas-Boi and allow me to merge this into your branch.