Skip to content

Commit

Permalink
Rename main Git development branch from master to main
Browse files Browse the repository at this point in the history
Avoid using terms associated with slavery and exploitation.

Signed-off-by: Jonas <jonas@freesources.org>
  • Loading branch information
mejo- committed Jan 16, 2023
1 parent c4c3c5f commit 7eb7518
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

* Resolves: # <!-- related github issue -->
* Target version: master
* Target version: main

### Summary

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
push:
branches:
- master
- main
- stable*

concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
push:
branches:
- master
- main
- stable*

concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
pull_request:
push:
branches:
- master
- main
- stable*
jobs:
php-linters:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
pull_request:
push:
branches:
- main
- master
- stable*

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
push:
branches:
- master
- main
- stable*

env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-nextcloud-ocp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
branches: ["master", "stable25", "stable24", "stable23"]
branches: ["main", "master", "stable25", "stable24", "stable23"]

name: update-nextcloud-ocp-${{ matrix.branches }}

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Nextcloud Office
[![Build Status](https://scrutinizer-ci.com/g/nextcloud/richdocuments/badges/build.png?b=master)](https://scrutinizer-ci.com/g/nextcloud/richdocuments/build-status/master)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/richdocuments/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/nextcloud/richdocuments/?branch=master)
[![Build Status](https://scrutinizer-ci.com/g/nextcloud/richdocuments/badges/build.png?b=main)](https://scrutinizer-ci.com/g/nextcloud/richdocuments/build-status/main)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/richdocuments/badges/quality-score.png?b=main)](https://scrutinizer-ci.com/g/nextcloud/richdocuments/?branch=main)
[![irc](https://img.shields.io/badge/IRC-%23nextcloud%20on%20freenode-orange.svg)](https://webchat.freenode.net/?channels=nextcloud)

**A [Nextcloud](https://nextcloud.com) app integrating Collabora Online into your Nextcloud!**

![](https://raw.githubusercontent.com/nextcloud/richdocuments/master/screenshots/Nextcloud-writer.png)
![](https://raw.githubusercontent.com/nextcloud/richdocuments/main/screenshots/Nextcloud-writer.png)

Nextcloud Office supports editing your documents in real time with multiple other editors, showing high fidelity, WYSIWYG rendering and preserving the layout and formatting of your documents.

Expand Down
6 changes: 3 additions & 3 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ You can also edit your documents off-line with the Collabora Office app from the
<website>https://collaboraoffice.com/</website>
<bugs>https://github.com/nextcloud/richdocuments/issues</bugs>
<repository type="git">https://github.com/nextcloud/richdocuments.git</repository>
<screenshot>https://github.com/nextcloud/richdocuments/raw/master/screenshots/Nextcloud-writer.png</screenshot>
<screenshot>https://github.com/nextcloud/richdocuments/raw/master/screenshots/Nextcloud-spreadsheet.png</screenshot>
<screenshot>https://github.com/nextcloud/richdocuments/raw/master/screenshots/Nextcloud-presentation.png</screenshot>
<screenshot>https://github.com/nextcloud/richdocuments/raw/main/screenshots/Nextcloud-writer.png</screenshot>
<screenshot>https://github.com/nextcloud/richdocuments/raw/main/screenshots/Nextcloud-spreadsheet.png</screenshot>
<screenshot>https://github.com/nextcloud/richdocuments/raw/main/screenshots/Nextcloud-presentation.png</screenshot>
<dependencies>
<nextcloud min-version="26" max-version="26"/>
</dependencies>
Expand Down

0 comments on commit 7eb7518

Please sign in to comment.