Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New logos without trademarks and remove trademarks from the website #110

Merged
merged 2 commits into from
Apr 12, 2024

Conversation

ejratl
Copy link
Contributor

@ejratl ejratl commented Oct 23, 2023

Added new STIX and TAXII logos from Jane Ginn.

Removed trademark symbols from the documentation pages.

@ejratl ejratl requested a review from adulau October 23, 2023 16:58
@ejratl ejratl changed the title New logos New logos without trademarks and remove trademarks from the website Apr 5, 2024
@clenk
Copy link
Contributor

clenk commented Apr 5, 2024

This would address oasis-tcs/cti-stix2#326

@ejratl
Copy link
Contributor Author

ejratl commented Apr 12, 2024

As discussed in the STIX WG on April 12, 2024, it is the will of the WG members that this PR be merged. The document that allows this can be found at the following link.
https://groups.oasis-open.org/viewdocument/status-report-on-stixtaxii-v21-an?CommunityKey=c6c33da0-d1ee-42dd-9427-018dc7d32277&tab=librarydocuments

@ejratl ejratl merged commit 470d269 into main Apr 12, 2024
3 checks passed
@ejratl ejratl deleted the new-logos branch April 12, 2024 13:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants