From e8355fe4ffb96b3148f3d3786b7a83bd5dadf13e Mon Sep 17 00:00:00 2001 From: snipe Date: Sat, 14 Mar 2015 03:21:22 -0700 Subject: [PATCH] Pulled code of conduct into its own file --- CODE_OF_CONDUCT.md | 13 +++++++++++++ CONTRIBUTING.md | 14 ++------------ README.md | 2 +- app/config/version.php | 4 ++-- 4 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000000..cd046319e5 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,13 @@ +## Contributor Code of Conduct + +As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities. + +We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion. + +Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct. + +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team. + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers. + +This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/) \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e1b3de9fb1..bb20a68117 100755 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -22,16 +22,6 @@ Thanks! ----- -# Contributor Code of Conduct +## Contributor Code of Conduct -As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities. - -We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion. - -Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct. - -Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team. - -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers. - -This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/) +Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms. diff --git a/README.md b/README.md index e1f62201eb..03901253ee 100755 --- a/README.md +++ b/README.md @@ -68,5 +68,5 @@ Forgetting to do this can mean your DB might end up out of sync with the new fil ## Contributor Code of Conduct -Please note that this project is released with a [Contributor Code of Conduct](CONTRIBUTING.md). By participating in this project you agree to abide by its terms. +Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms. diff --git a/app/config/version.php b/app/config/version.php index d2d3615774..c5927278d2 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,5 +1,5 @@ 'v1.2.6.1-39', - 'hash_version' => 'v1.2.6.1-39-g6f38f76', + 'app_version' => 'v1.2.6.1-40', + 'hash_version' => 'v1.2.6.1-40-g41928e4', ); \ No newline at end of file