From 4dfbcf0318cb33e9e42705e1a88a769a830a1349 Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Thu, 15 Jun 2017 16:04:08 +0200 Subject: [PATCH] Add security contact to the README and point to contributing guide Removed useless gitflow information in favor of simpler PR-based approach described in the contributing doc --- README.md | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 901544c86..89e4e708d 100644 --- a/README.md +++ b/README.md @@ -83,17 +83,10 @@ $ bin/gpm update # Contributing -We appreciate any contribution to Grav, whether it is related to bugs, grammar, or simply a suggestion or improvement. -However, we ask that any contributions follow our simple guidelines in order to be properly received. +We appreciate any contribution to Grav, whether it is related to bugs, grammar, or simply a suggestion or improvement! Please refer to the [Contributing guide](CONTRIBUTING.md) for more guidance on this topic. -All our projects follow the [GitFlow branching model][gitflow-model], from development to release. If you are not familiar with it, there are several guides and tutorials to make you understand what it is about. - -You will probably want to get started by installing [this very good collection of git extensions][gitflow-extensions]. - -What you mainly want to know is that: - -- All the main activity happens in the `develop` branch. Any pull request should be addressed only to that branch. We will not consider pull requests made to the `master`. -- It's very well appreciated, and highly suggested, to start a new feature whenever you want to make changes or add functionalities. It will make it much easier for us to just checkout your feature branch and test it, before merging it into `develop` +## Security issues +If you discover a possible security issue related to Grav or one of its plugins, please send an email to the core team at contact@getgrav.org and we'll address it as soon as possible. # Getting Started