Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/nightly' into dict-items
Browse files Browse the repository at this point in the history
  • Loading branch information
jayzhan211 committed Apr 27, 2024
2 parents 4fd37c6 + d344d17 commit b1b2015
Show file tree
Hide file tree
Showing 106 changed files with 3,467 additions and 1,152 deletions.
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Expand Up @@ -4,8 +4,8 @@
/stdlib/ @modularml/mojo-standard-library

# Documentation
/docs/ @scottamain @arthurevans
/stdlib/docs/ @scottamain @arthurevans
/docs/ @modularml/mojo-docs
/stdlib/docs/ @modularml/mojo-docs @modularml/mojo-standard-library

# Examples
/examples/ @jackos
6 changes: 3 additions & 3 deletions CODE_OF_CONDUCT.md
@@ -1,4 +1,4 @@
# Code of Conduct
# Code of conduct

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to make participation in our project and
Expand All @@ -7,7 +7,7 @@ body size, disability, ethnicity, gender identity and expression, level of
experience, nationality, personal appearance, race, religion, or sexual
identity and orientation.

## Our Standards
## Our standards

All community forums and spaces are meant for professional interactions that
are friendly, inclusive, helpful, and collaborative. Examples of behavior that
Expand All @@ -32,7 +32,7 @@ participants include:
- Conduct which could reasonably be considered inappropriate for the forum in
which it occurs.

## Our Responsibilities
## Our responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Expand Up @@ -157,7 +157,7 @@ experience with the process.

You can use a pull request to propose a change or bug fix to the Mojo Standard
Library, Mojo examples, or Mojo documentation. This page gives an overview of
the process. For a more detailed walkthrough, see
the process. For a more detailed walkthrough, see
[How to contribute to the Mojo standard library: a step-by-step guide](https://www.modular.com/blog/how-to-contribute-to-mojo-standard-library-a-step-by-step-guide).

**Note:** Pull requests should be submitted against the `nightly` branch,
Expand Down
12 changes: 10 additions & 2 deletions README.md
@@ -1,6 +1,14 @@
<p align="center">
<div align="center">
<img src="https://modular-assets.s3.amazonaws.com/images/mojo_github_logo_bg.png">
</p>

[Website][Mojo] | [Getting Started] | [API Documentation] | [Contributing] | [Changelog]
</div>

[Mojo]: https://www.modular.com/mojo/
[Getting Started]: https://docs.modular.com/mojo/manual/get-started/
[API Documentation]: https://docs.modular.com/mojo/lib
[Contributing]: ./CONTRIBUTING.md
[Changelog]: ./docs/changelog.md

# Welcome to Mojo 🔥

Expand Down

0 comments on commit b1b2015

Please sign in to comment.