Reset README back to HEAD
This commit is contained in:
parent
b9525ae91f
commit
6aae5ca525
1 changed files with 2 additions and 59 deletions
61
README.md
61
README.md
|
@ -1,59 +1,7 @@
|
|||
<<<<<<< HEAD
|
||||
# Tuwunel <sup>🎔</sup>
|
||||
=======
|
||||
# continuwuity
|
||||
|
||||
<!--
|
||||
[](https://matrix.to/#/#conduwuit:puppygock.gay) [](https://matrix.to/#/#conduwuit-space:puppygock.gay)
|
||||
|
||||
[](https://github.com/girlbossceo/conduwuit/actions/workflows/ci.yml)
|
||||
|
||||
    
|
||||
|
||||
|
||||
|
||||
&link=https%3A%2F%2Fhub.docker.com%2Frepository%2Fdocker%2Fgirlbossceo%2Fconduwuit%2Ftags%3Fname%3Dlatest) &link=https%3A%2F%2Fhub.docker.com%2Frepository%2Fdocker%2Fgirlbossceo%2Fconduwuit%2Ftags%3Fname%3Dmain)
|
||||
-->
|
||||
>>>>>>> e054a56b (docs: New readme)
|
||||
|
||||
   
|
||||
|
||||
<!-- ANCHOR: catchphrase -->
|
||||
|
||||
<<<<<<< HEAD
|
||||
## High Performance [Matrix](https://matrix.org/) Chat Homeserver in Rust!
|
||||
|
||||
<!-- ANCHOR_END: catchphrase -->
|
||||
|
||||
<!-- ANCHOR: body -->
|
||||
|
||||
### Status
|
||||
|
||||
Tuwunel is a successor to conduwuit. We are currently in the process of transitioning.
|
||||
The software is just as great as before. Please bear with us.
|
||||
|
||||
### Goals
|
||||
|
||||
**Maximum Performance.** Tuwunel relentlessly pursues optimization, embracing hardware
|
||||
acceleration with the highest throughput and lowest latency for messages.
|
||||
|
||||
**Unlimited Features.** Tuwunel is working toward a fully modular design to leverage
|
||||
the widest number of contributor features. Our goal is to never have to say no to your ideas.
|
||||
|
||||
#### Can I migrate or switch from Conduwuit?
|
||||
|
||||
Yes.
|
||||
|
||||
#### Can I migrate or switch from Conduit?
|
||||
|
||||
No.
|
||||
|
||||
#### Can I migrate from Synapse?
|
||||
|
||||
No, but this is planned.
|
||||
|
||||
## Tuwunel <sup>🎔</sup>
|
||||
=======
|
||||
## A community-driven [Matrix](https://matrix.org/) homeserver in Rust
|
||||
|
||||
<!-- ANCHOR_END: catchphrase -->
|
||||
|
@ -122,10 +70,7 @@ We're working our way through all of the issues in the [Forgejo project](https:/
|
|||
- Dendrite: No
|
||||
- Synapse: No
|
||||
|
||||
Although you can't migrate your data from other homeservers, it is perfectly acceptable to set up continuwuity on the same domain as a previous homeserver.
|
||||
>>>>>>> e054a56b (docs: New readme)
|
||||
|
||||
Tuwunel's theme is **empathy in communication** defined by the works of [Edith Stein](https://plato.stanford.edu/entries/stein/).
|
||||
We haven't written up a guide on migrating from incompatible homeservers yet. Reach out to us if you need to do this!
|
||||
|
||||
<!-- ANCHOR_END: body -->
|
||||
|
||||
|
@ -158,14 +103,12 @@ When incorporating code from other forks:
|
|||
|
||||
<!-- ANCHOR: footer -->
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
#### Contact
|
||||
|
||||
<!-- TODO: contact details -->
|
||||
|
||||
>>>>>>> e054a56b (docs: New readme)
|
||||
<!-- ANCHOR_END: footer -->
|
||||
|
||||
|
||||
[continuwuity]: https://forgejo.ellis.link/continuwuation/continuwuity
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue