[ckan-changes] [ckan/ckan] 7bff7a: Adds a code of conduct

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: 7bff7a22fd357a291eaff85431c134d78abc4857
      https://github.com/ckan/ckan/commit/7bff7a22fd357a291eaff85431c134d78abc4857
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2016-01-19 (Tue, 19 Jan 2016)

  Changed paths:
    A CONDUCT.rst

  Log Message:
  -----------
  Adds a code of conduct


  Commit: 496cd8db96a41c40dcf8aabb5afd462f1cb89bf1
      https://github.com/ckan/ckan/commit/496cd8db96a41c40dcf8aabb5afd462f1cb89bf1
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2016-01-26 (Tue, 26 Jan 2016)

  Changed paths:
    M CONDUCT.rst

  Log Message:
  -----------
  Change the email address for complaints


  Commit: 3ac74d7b98d47bb75db1d9b4e36adc9c33a846fb
      https://github.com/ckan/ckan/commit/3ac74d7b98d47bb75db1d9b4e36adc9c33a846fb
  Author: amercader <amercadero at gmail.com>
  Date:   2016-01-27 (Wed, 27 Jan 2016)

  Changed paths:
    A CONDUCT.rst

  Log Message:
  -----------
  Merge branch 'code-of-conduct'


Compare: https://github.com/ckan/ckan/compare/63b2af18b86f...3ac74d7b98d4