Merge pull request #147 from rgaiacs/update-coc
authorRaniere Silva <raniere@rgaiacs.com>
Sat, 6 May 2017 08:04:42 +0000 (09:04 +0100)
committerGitHub <noreply@github.com>
Sat, 6 May 2017 08:04:42 +0000 (09:04 +0100)
Updated CONDUCT.md


Trivial merge