From ad3bf1df8947d4a8198c71701346e674575dc374 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 30 Oct 2023 17:08:04 +0100 Subject: chore: Switch from master to main branch Signed-off-by: Joas Schilling --- .github/contributing.md | 4 ++-- CHANGELOG.md | 2 +- Makefile | 2 +- README.md | 4 ++-- appinfo/info.xml | 10 +++++----- docs/bot-list.md | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/contributing.md b/.github/contributing.md index 70cab62c9..202d69000 100644 --- a/.github/contributing.md +++ b/.github/contributing.md @@ -2,14 +2,14 @@ ### Short version - * The [**issue template can be found here**](https://raw.github.com/nextcloud/spreed/master/.github/issue_template.md) but be aware of the different repositories! See list below. Please always use the issue template when reporting issues. + * The [**issue template can be found here**](https://raw.github.com/nextcloud/spreed/main/.github/issue_template.md) but be aware of the different repositories! See list below. Please always use the issue template when reporting issues. ### Guidelines * Please search the existing issues first, it's likely that your issue was already reported or even fixed. - Go to one of the repositories, click "issues" and type any word in the top search/command bar. - You can also filter by appending e. g. "state:open" to the search string. - More info on [search syntax within github](https://help.github.com/articles/searching-issues) -* Report the issue using our [template](https://raw.github.com/nextcloud/spreed/master/.github/issue_template.md), it includes all the informations we need to track down the issue. +* Report the issue using our [template](https://raw.github.com/nextcloud/spreed/main/.github/issue_template.md), it includes all the informations we need to track down the issue. If your issue appears to be a bug, and hasn't been reported, open a new issue. diff --git a/CHANGELOG.md b/CHANGELOG.md index abec66c95..21e6cc4f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2874,7 +2874,7 @@ All notable changes to this project will be documented in this file. ## 6.0.0 – 2019-04-25 ### Added -- Administrators can now define commands which can be used in the chat. See [commands.md](https://github.com/nextcloud/spreed/blob/master/docs/commands.md) for more information. You can install some sample commands via the console. +- Administrators can now define commands which can be used in the chat. See [the commands documentation](https://nextcloud-talk.readthedocs.io/en/latest/commands/) for more information. You can install some sample commands via the console. [#1453](https://github.com/nextcloud/spreed/pull/1453) [#1662](https://github.com/nextcloud/spreed/pull/1662) - There is now a "Talk updates" conversation which will help the user to discover some features diff --git a/Makefile b/Makefile index 9306391bf..d9a0a1b75 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ source_dir=$(build_dir)/source sign_dir=$(build_dir)/sign package_name=$(app_name) cert_dir=$(HOME)/.nextcloud/certificates -version+=master +version+=main all: dev-setup build-production diff --git a/README.md b/README.md index 3273faf00..59e4ad8fc 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ | [🚧 Development Setup](#-development-setup) | -![](https://raw.githubusercontent.com/nextcloud/spreed/master/docs/call-in-action.jpg) +![](https://raw.githubusercontent.com/nextcloud/spreed/main/docs/call-in-action.jpg) ## ✨ Why is this so awesome? @@ -98,4 +98,4 @@ You can always pick a task of any milestone, and we will help you to get it into ### 💙 Contribution Guidelines -For more information please see the [guidelines for contributing](https://github.com/nextcloud/spreed/blob/master/.github/contributing.md) to this repository. +For more information please see the [guidelines for contributing](https://github.com/nextcloud/spreed/blob/main/.github/contributing.md) to this repository. diff --git a/appinfo/info.xml b/appinfo/info.xml index 0a2f43920..f39928a84 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -45,11 +45,11 @@ And in the works for the [coming versions](https://github.com/nextcloud/spreed/m https://github.com/nextcloud/spreed/issues https://github.com/nextcloud/spreed.git - https://raw.githubusercontent.com/nextcloud/spreed/master/docs/call-in-action.jpg - https://raw.githubusercontent.com/nextcloud/spreed/master/docs/chat.png - https://raw.githubusercontent.com/nextcloud/spreed/master/docs/file-darg-and-drop.png - https://raw.githubusercontent.com/nextcloud/spreed/master/docs/screensharing.png - https://raw.githubusercontent.com/nextcloud/spreed/master/docs/video-verfication.png + https://raw.githubusercontent.com/nextcloud/spreed/main/docs/call-in-action.jpg + https://raw.githubusercontent.com/nextcloud/spreed/main/docs/chat.png + https://raw.githubusercontent.com/nextcloud/spreed/main/docs/file-darg-and-drop.png + https://raw.githubusercontent.com/nextcloud/spreed/main/docs/screensharing.png + https://raw.githubusercontent.com/nextcloud/spreed/main/docs/video-verfication.png diff --git a/docs/bot-list.md b/docs/bot-list.md index 5520ba679..b49daba90 100644 --- a/docs/bot-list.md +++ b/docs/bot-list.md @@ -2,7 +2,7 @@ If you want to write your own bot or webhook, please see the [Bots and Webhooks developer documentation](bots.md). Afterwards send a pull -request against the [docs/bot-list.md](https://github.com/nextcloud/spreed/blob/master/docs/bot-list.md) +request against the [docs/bot-list.md](https://github.com/nextcloud/spreed/blob/main/docs/bot-list.md) to add your bot to the list, using the following template: ```markdown -- cgit v1.2.3