diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 64a7d26..e02933e 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -4,7 +4,7 @@ 1. Fork the repository 2. Create a new branch for each feature or improvement -3. Send a pull request from each feature branch to the master branch +3. Send a pull request from each feature branch to the stable branch It is very important to separate new features or improvements into separate feature branches, and to send a pull request for each branch. This allows us to review and pull in new features or improvements individually. diff --git a/src/classes/Controllers/Web/Servers.php b/src/classes/Controllers/Web/Servers.php index aee8590..29d505c 100644 --- a/src/classes/Controllers/Web/Servers.php +++ b/src/classes/Controllers/Web/Servers.php @@ -46,7 +46,7 @@ class Servers extends BaseController { $stable_version = $this->simplecache->get('stable_version'); if (!$stable_version) { - $stable_version = trim(file_get_contents('https://git.friendi.ca/friendica/friendica/raw/branch/master/VERSION')); + $stable_version = trim(file_get_contents('https://git.friendi.ca/friendica/friendica/raw/branch/stable/VERSION')); $this->simplecache->set('stable_version', $stable_version); } diff --git a/src/classes/Controllers/Web/Statistics.php b/src/classes/Controllers/Web/Statistics.php index 673d1a5..c9c8999 100644 --- a/src/classes/Controllers/Web/Statistics.php +++ b/src/classes/Controllers/Web/Statistics.php @@ -55,7 +55,7 @@ class Statistics extends BaseController $stable_version = $this->simplecache->get('stable_version'); if (!$stable_version) { - $stable_version = trim(file_get_contents('https://git.friendi.ca/friendica/friendica/raw/branch/master/VERSION')); + $stable_version = trim(file_get_contents('https://git.friendi.ca/friendica/friendica/raw/branch/stable/VERSION')); $this->simplecache->set('stable_version', $stable_version); } diff --git a/src/classes/Pollers/Server.php b/src/classes/Pollers/Server.php index 16492dd..58c5c51 100644 --- a/src/classes/Pollers/Server.php +++ b/src/classes/Pollers/Server.php @@ -355,7 +355,7 @@ class Server } else { $stable_version = $this->simplecache->get('stable_version'); if (!$stable_version) { - $stable_version = trim(file_get_contents('https://git.friendi.ca/friendica/friendica/raw/branch/master/VERSION')); + $stable_version = trim(file_get_contents('https://git.friendi.ca/friendica/friendica/raw/branch/stable/VERSION')); $this->simplecache->set('stable_version', $stable_version); }