Skip to content

Commit

Permalink
Merge branch '3.6' into 4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
GrahamCampbell committed Jul 14, 2020
2 parents d8d60d5 + 2065bed commit a0fe44d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ We accept contributions via pull requests on Github. Please review these guideli

## Guidelines

* Please follow the [PSR-2 Coding Style Guide](https://www.php-fig.org/psr/psr-2/)..
* Please follow the [PSR-2 Coding Style Guide](https://www.php-fig.org/psr/psr-2/).
* Ensure that the current tests pass, and if you've added something new, add the tests where relevant.
* Send a coherent commit history, making sure each individual commit in your pull request is meaningful.
* You may need to [rebase](https://git-scm.com/book/en/v2/Git-Branching-Rebasing) to avoid merge conflicts.
Expand Down

0 comments on commit a0fe44d

Please sign in to comment.