Skip to content

Commit

Permalink
chore: Rename master to main #blacklivesmatter (#6627)
Browse files Browse the repository at this point in the history
* chore: Rename `master` to `main` #blacklivesmatter

Resolves #5803

* docs(contributing): fix broken ref link to `programming-playgrounds`

Fix over #5449 and commit 3c42c36

(cherry picked from commit 59ebfe3)

* fix: Complete #6614 upstream/main merge

Over commit: 4d3c9fe

Co-authored-by: ImVector <[email protected]>

Co-authored-by: ImVector <[email protected]>
  • Loading branch information
davorpa and LuigiImVector authored Nov 23, 2021
1 parent 8997e2e commit ee4b9ee
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Add resource(s) | Remove resource(s) | Add info | Improve repo
### For book lists, is it a book? For course lists, is it a course? etc.

## Checklist:
- [ ] Read our [contributing guidelines](https://github.com/EbookFoundation/free-programming-books/blob/master/CONTRIBUTING.md)
- [ ] Read our [contributing guidelines](https://github.com/EbookFoundation/free-programming-books/blob/main/docs/CONTRIBUTING.md)
- [ ] Search for duplicates.
- [ ] Include author(s) and platform where appropriate.
- [ ] Put lists in alphabetical order, correct spacing.
Expand Down
2 changes: 1 addition & 1 deletion docs/CONTRIBUTING-es.md
Original file line number Diff line number Diff line change
Expand Up @@ -257,4 +257,4 @@ Si es posible imprimirlo y conservar su esencia, no es un Tutorial Interactivo.
[in_process]: #in_process
[archived]: #archived
[markdown_guide]: https://guides.github.com/features/mastering-markdown/
[programming_playgrounds_list]: (https://github.com/EbookFoundation/free-programming-books/blob/master/more/free-programming-playgrounds.md)
[programming_playgrounds_list]: https://github.com/EbookFoundation/free-programming-books/blob/main/more/free-programming-playgrounds.md
2 changes: 1 addition & 1 deletion docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@


## Contributor License Agreement
By contributing you agree to the [LICENSE](https://github.com/EbookFoundation/free-programming-books/blob/master/LICENSE) of this repository.
By contributing you agree to the [LICENSE](https://github.com/EbookFoundation/free-programming-books/blob/main/LICENSE) of this repository.

## Contributor Code of Conduct
By contributing you agree to respect the [Code of Conduct](CODE_OF_CONDUCT.md) of this repository. ([translations](../README.md#translations))
Expand Down

0 comments on commit ee4b9ee

Please sign in to comment.