Permalink
Commits on Mar 22, 2015
  1. Update code_of_conduct.md

    dianaclarke committed Mar 22, 2015
Commits on Jul 16, 2013
  1. Merge pull request #11 from tobych/numbering

    Simplify formatting to correct section numbering
    dianaclarke committed Jul 16, 2013
Commits on Mar 29, 2013
  1. Simplify formatting to correct section numbering

    The third section was being numbered 1. Reading around, it appears
    Markdown is bad at handling nested lists with multiple paragraphs.
    tobych committed Mar 29, 2013
Commits on Mar 23, 2013
  1. Merge pull request #2 from kstrauser/master

    Minor copy edits
    dianaclarke committed Mar 23, 2013
  2. Merge pull request #7 from pythonchelle/master

    Attempt to remove ambiguity around incident reporting channels
    jnoller committed Mar 23, 2013
Commits on Mar 22, 2013
  1. Merge remote-tracking branch 'upstream/master'

    Kirk Strauser committed Mar 22, 2013
  2. Update README.md

    Forgot note
    jnoller committed Mar 22, 2013
  3. Update README.md

    Updated readme
    jnoller committed Mar 22, 2013
  4. Merge pull request #4 from pythonchelle/master

    Reworded the public-shaming note. via pythonchelle
    jnoller committed Mar 22, 2013
  5. Update Attendee Procedure for incident handling.md

    Re-wording of the public-shaming note. Hopefully less "silence"-oriented and heavier on the "what we might get out of it" if we give the community a chance to resolve issues before they hit the internet at large.
    
    Reconfigurations and edits very welcome!
    pythonchelle committed Mar 22, 2013
Commits on Mar 21, 2013
  1. Minor copy edits for readability and consistency

    Removed redundant "as well".
    Re-punctuated run-on sentences.
    Removed periods from the ends of single-sentence list items. Added them to
    the ends of multi-sentence list items.
    Grammar tweaks.
    Kirk Strauser committed Mar 21, 2013
  2. Make neutral

    jnoller committed Mar 21, 2013
  3. Typo; fix wording

    jnoller committed Mar 21, 2013
  4. Further note non disclosure

    jnoller committed Mar 21, 2013
  5. Changes 3/21/13 per PSF members / PyCon staff request to clarify pers…

    …onal information disclosure / public name and shame
    jnoller committed Mar 21, 2013
  6. Initial commit

    jnoller committed Mar 21, 2013