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

Pull in updates from https://github.com/block/oss-project-template/ #97

Merged
merged 10 commits into from
Jan 15, 2025

Conversation

myronmarston
Copy link
Collaborator

Some of our files that originated from https://github.com/block/oss-project-template/ have been updated. This pulls in the updates.

ALRubinger and others added 10 commits November 14, 2024 11:44
… direction

Existing copy that GC is available as a resource for remediation will suffice
…de-of-conduct

# By Andrew Lee Rubinger (8) and joecoufal-block-xyz (1)
# Via GitHub
* oss-template/main:
  Update CODE_OF_CONDUCT.md (#3)
  Update LICENSE to 2025
  Fix typo in CODE_OF_CONDUCT.md
  Updates to Block CoC
  Link email in CoC
  Update CODE_OF_CONDUCT.md
  Remove fragile external file references
  Issue #25: Remove strong language about GC as oversight for technical direction
  Update config.yml with now-valid Discord link

# Conflicts:
#	.github/ISSUE_TEMPLATE/config.yml
#	LICENSE
@myronmarston myronmarston merged commit 3ed9da7 into main Jan 15, 2025
18 checks passed
@myronmarston myronmarston deleted the myron/update-code-of-conduct branch January 15, 2025 00:36
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.

4 participants