Commit 4ff93dd9 authored by Nick Mathewson's avatar Nick Mathewson 🐛
Browse files

Merge remote-tracking branch 'rl1987/doc26638'

parents a1a55a33 287b64ee
The Tor Project is committed to fostering a inclusive community
where people feel safe to engage, share their points of view, and
participate. For the latest version of our Code of Conduct, please
see
https://gitweb.torproject.org/community/policies.git/plain/code_of_conduct.txt
......@@ -136,6 +136,7 @@ include contrib/include.am
EXTRA_DIST+= \
ChangeLog \
CONTRIBUTING \
CODE_OF_CONDUCT \
INSTALL \
LICENSE \
Makefile.nmake \
......
o Minor features (development):
- Copy paragraph and URL to Tor's code of conduct document
from CONTRIBUTING to new CODE_OF_CONDUCT file. Resolves
ticket 26638.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment