From c05160a9c96f8f977052aa81a907d06507a710c1 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Tue, 1 Jan 2019 16:23:38 -0500 Subject: [PATCH] Updated Contributing to Jellyfin (markdown) --- Contributing-to-Jellyfin.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Contributing-to-Jellyfin.md b/Contributing-to-Jellyfin.md index 3f752af..a7c9d73 100644 --- a/Contributing-to-Jellyfin.md +++ b/Contributing-to-Jellyfin.md @@ -64,7 +64,7 @@ When submitting a new PR, please ensure you do the following things. If you have ## The Master branch -The `master` branch is the current working branch of Jellyfin. Until we reach a first official release with our own versioning, releases are limited to build identifiers (i.g. `3.5.2-X`). Each update to `master` occurs through a roll-up PR made by an admin team member, on a semi-regular basis, which will identify the relevant PRs (and issues) that are fixed and help ensure there is a consistent trail of development work in the history. `master` merges must be approved by two administrative team members, thus ensuring a majority of the team accepts the changes. +The `master` branch is the current main branch of Jellyfin and its public face on GitHub, as opposed to the constantly-moving `dev` branch. Until we reach a first official release with our own versioning, releases are limited to build identifiers (i.g. `3.5.2-X`) based on `master`. Each update to `master` occurs through a roll-up PR made by an admin team member, on a semi-regular basis, which will identify the relevant PRs (and issues) that are fixed and help ensure there is a consistent trail of development work in the history. `master` merges must be approved by two administrative team members, thus ensuring a majority of the team accepts the changes. # Other Contributions to Jellyfin