Skip to content

Commit

Permalink
Merge branch 'main' into metriken
Browse files Browse the repository at this point in the history
  • Loading branch information
brayniac authored Aug 8, 2023
2 parents e8dfef8 + 8781ec7 commit 601264f
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@ Pelikan is a framework for developing cache services. It is:
[![License: Apache-2.0][license-badge]][license-url]
[![Build Status][cargo-build-badge]][cargo-build-url]
[![Fuzz Status][cargo-fuzz-badge]][cargo-fuzz-url]
[![Zulip Chat][zulip-badge]][zulip-url]

[Website](http://pelikan.io) |
[Chat][zulip-url]
[Chat][discord-url]

# Content

Expand Down Expand Up @@ -166,10 +165,9 @@ included under the `config` directory.

## Stay in touch

- Join our project chat on [![Zulip][zulip-badge]][zulip-url]
for questions and discussions
- Follow us on Twitter: [@pelikan_cache]
- Join our [Discord server][discord-url] for questions and discussions
- Visit <http://pelikan.io>
- Follow us on Twitter: [@pelikan_cache]

## Contributing

Expand Down Expand Up @@ -207,3 +205,4 @@ This software is licensed under the Apache 2.0 license, see [LICENSE](LICENSE) f
[zulip-badge]: https://img.shields.io/badge/zulip-join_chat-blue.svg
[zulip-url]: https://pelikan.zulipchat.com/
[grpc-url]: https://grpc.io/docs/protoc-installation/
[discord-url]: https://discord.gg/yUBWHqxGUR

0 comments on commit 601264f

Please sign in to comment.