Skip to content

Commit

Permalink
Merge branch 'main' of github.com:propensive/merino
Browse files Browse the repository at this point in the history
  • Loading branch information
propensive committed Jun 11, 2024
2 parents 2e4f56a + 80f2c9d commit 2d762e4
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
Binary file modified doc/images/1000x1000.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/2400x2400@300dpi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ column in which the error occurs, and an enumeration value (of type
## Status

Merino
jawn is classified as __maturescent__. For reference, Scala One projects are
jawn is classified as __maturescent__. For reference, Soundness projects are
categorized into one of the following five stability levels:

- _embryonic_: for experimental or demonstrative purposes only, without any guarantees of longevity
Expand Down Expand Up @@ -174,7 +174,7 @@ OÜ](https://propensive.com/).
Merino is named after the variety of sheep known for the quality of their fleeces, in keeping with the trend for
JSON libraries to allude to the story of Jason and the Argonauts.

In general, Scala One project names are always chosen with some rationale,
In general, Soundness project names are always chosen with some rationale,
however it is usually frivolous. Each name is chosen for more for its
_uniqueness_ and _intrigue_ than its concision or catchiness, and there is no
bias towards names with positive or "nice" meanings—since many of the libraries
Expand Down

0 comments on commit 2d762e4

Please sign in to comment.