Merge pull request #2 from orchid00/patch-1
authorErin Becker <erinstellabecker@gmail.com>
Tue, 20 Feb 2018 11:01:44 +0000 (13:01 +0200)
committerGitHub <noreply@github.com>
Tue, 20 Feb 2018 11:01:44 +0000 (13:01 +0200)
commit6e6f4f39dd5ed0f56099f283618d36d1a3a22544
tree43e5a2d1164ad420e5d345320c06e8f7907a3827
parenta2b59623e3e466e4d52c7f3120e58726a63e329d
parentd09f7c162aa19088c173d018520c811f3744256f
Merge pull request #2 from orchid00/patch-1

Update CONDUCT.md