diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-09 09:40:04 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-09 09:40:04 -0400 |
| commit | 4ff93dd94fb548251ad3d5379e4a329e51e93ef4 (patch) | |
| tree | a14dfb930df9ce3099c0ff8cf05fc9712da3bb38 /Makefile.am | |
| parent | a1a55a33c20364ccbc0540125d662203152a20c2 (diff) | |
| parent | 287b64ee1052508a5328549b2e18d91762a0eb5d (diff) | |
| download | tor-4ff93dd94fb548251ad3d5379e4a329e51e93ef4.tar.gz tor-4ff93dd94fb548251ad3d5379e4a329e51e93ef4.zip | |
Merge remote-tracking branch 'rl1987/doc26638'
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index c74b0e30a8..0f934cf0f2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -136,6 +136,7 @@ include contrib/include.am EXTRA_DIST+= \ ChangeLog \ CONTRIBUTING \ + CODE_OF_CONDUCT \ INSTALL \ LICENSE \ Makefile.nmake \ |