Merge branch 'wir-social' of https://github.com/wir-social/wir-social into wir-social

# Conflicts:
#	README.md
This commit is contained in:
Wolfgang Huß 2021-05-25 17:36:25 +02:00
commit 53d2232ed3

View File

@ -1,6 +1,7 @@
# Ocelot-Social-Deploy-Rebranding
# Wir.Social Deploys And Rebrands Ocelot.Social
This repository is an in use template to rebrand, configure, and deploy [ocelot.social](https://github.com/Ocelot-Social-Community/Ocelot-Social) networks.
This repository is used to rebrand, configure, and deploy the [wir.social](https://wir.social) networks.
The forked original repository is [Ocelot-Social-Deploy-Rebranding](https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding).
<!-- [![Build Status](https://travis-ci.com/Human-Connection/Human-Connection.svg?branch=master)](https://travis-ci.com/Human-Connection/Human-Connection) -->
<!-- [![Codecov Coverage](https://img.shields.io/codecov/c/github/Human-Connection/Human-Connection/master.svg?style=flat-square)](https://codecov.io/gh/Human-Connection/Human-Connection/) -->
@ -9,7 +10,7 @@ This repository is an in use template to rebrand, configure, and deploy [ocelot.
<!-- [![Open Source Helpers](https://www.codetriage.com/human-connection/human-connection/badges/users.svg)](https://www.codetriage.com/human-connection/human-connection) -->
<p align="center">
<img src="branding/static/img/custom/welcome.svg" alt="Ocelot-Social" width="40%" height="40%">
<img src="branding/static/img/custom/logo-squared.svg" alt="wir.social" width="40%" height="40%">
</p>
<!--
@ -26,6 +27,7 @@ Logins:
| `admin@example.org` | 1234 | admin |
-->
<!--
## Usage
Fork this repository and configure as well as rebrand it for your own [ocelot.social](https://github.com/Ocelot-Social-Community/Ocelot-Social) network.
@ -35,12 +37,13 @@ Fork this repository and configure as well as rebrand it for your own [ocelot.so
Afterwards you can [deploy](deployment/README.md) it on your server:
- [Kubernetes with Helm](deployment/kubernetes/README.md)
-->
## Developer Chat
Join our friendly open-source community on [Discord](https://discordapp.com/invite/DFSjPaX) :heart_eyes_cat:
Just introduce yourself at `#introduce-yourself` and mention `@@Mentor` to get you onboard :neckbeard:
Check out the [contribution guideline](./CONTRIBUTING.md), too!
Check out the [contribution guideline](https://github.com/Ocelot-Social-Community/Ocelot-Social/blob/master/CONTRIBUTING.md), too!
We give write permissions to every developer who asks for it. Just text us on
[Discord](https://discord.gg/6ub73U3).