swcarpentry/site — pull request #678 by gvwilson (2014-11-24 13:20:09+00:00)
Title: Consolidating code of conduct

Combining two parts (long form and short form) into one.