Merge commit 'f1a6f4333a75f5bc186334f7f43a26e969cd712d' into glitch-soc/merge-upstream

This commit is contained in:
Claire
2025-05-25 14:51:59 +02:00
148 changed files with 1524 additions and 1211 deletions
+3 -3
View File
@@ -73,10 +73,10 @@ Mastodon is a **free, open-source social network server** based on ActivityPub w
### Requirements
- **PostgreSQL** 12+
- **Redis** 4+
- **PostgreSQL** 13+
- **Redis** 6.2+
- **Ruby** 3.2+
- **Node.js** 18+
- **Node.js** 20+
The repository includes deployment configurations for **Docker and docker-compose** as well as specific platforms like **Heroku**, and **Scalingo**. For Helm charts, reference the [mastodon/chart repository](https://github.com/mastodon/chart). The [**standalone** installation guide](https://docs.joinmastodon.org/admin/install/) is available in the documentation.