On 09/06/2016 05:42 PM, Matthew Flaschen wrote:
The community approved the introduction to the Committee section (https://www.mediawiki.org/wiki/Code_of_Conduct/Draft#Page:_Code_of_Conduct.2...) (the part after "Committee" and before the "Diversity" section), as well as the "Diversity" section (https://www.mediawiki.org/wiki/Code_of_Conduct/Draft#Diversity).
There was not consensus to approve the "Conflict of interest" (https://www.mediawiki.org/wiki/Code_of_Conduct/Draft#Conflict_of_interest) section. Work will continue on this section. See the top of https://www.mediawiki.org/wiki/Talk:Code_of_Conduct/Draft#Finalize_.22Confli... (including the sections linked from those bullet points).
There has been further discussion on it, aiming to solve those issues. Please participate in the sub-sections of https://www.mediawiki.org/wiki/Talk:Code_of_Conduct/Draft#Finalize_.22Confli... and make sure your concerns are being addressed.
Thanks.
Matt Flaschen