From 2c806ac77c5370d43b464ce349d8e462b4a8c4c5 Mon Sep 17 00:00:00 2001 From: Maxim Filippov Date: Fri, 29 Nov 2019 16:17:07 +0900 Subject: [PATCH] Add notes on new branches --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index f6b359c6..08196552 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,13 @@ Admin UI for pleroma instance owners. +### Branches + +There are two main branches here: + +- `develop`: ongoing work and all merge requests go here, *unstable* +- `master`: after `develop` is stabilized it is merged to `master`, `master` is *stable*, allegedly + ### Features 1. User administration: grant roles to users (admin/moderator), deactivate/delete as well as force their statuses to have NSFW tag, strip media and many more