diff options
| author | Sacha Chua <sacha@sachachua.com> | 2021-01-16 00:09:12 -0500 |
|---|---|---|
| committer | Sacha Chua <sacha@sachachua.com> | 2021-01-16 00:09:12 -0500 |
| commit | 3dada39bece8fa8b262ba3a69338876e952f28b1 (patch) | |
| tree | 86f4912c607485265dc73a456054c8bdaa0a099b /conduct.md | |
| parent | 2448dbcf9afdb25df9f52411973f2bc79ad21ad4 (diff) | |
| parent | c1591d3f9dd1e929bb26a2c308b8a8692a5bfa9e (diff) | |
| download | emacsconf-wiki-3dada39bece8fa8b262ba3a69338876e952f28b1.tar.xz emacsconf-wiki-3dada39bece8fa8b262ba3a69338876e952f28b1.zip | |
Merge branch 'master' of git.emacsconf.org:emacsconf-wiki
Diffstat (limited to 'conduct.md')
| -rw-r--r-- | conduct.md | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1,14 +1,14 @@ -[[!meta title="Code of Conduct"]] +[[!meta title="Guidelines for Conduct"]] [[!meta copyright=""" Copyright © 2010, 2013, 2018 Free Software Foundation, Inc.<br/> Copyright © 2019 Amin Bandali """]] -This Code of Conduct, originally based on [that of -LibrePlanet](//libreplanet.org/wiki/LibrePlanet:About/Code_of_Conduct), -applies to us as participants in any campaigns, projects, and -communities under the EmacsConf name, and covers our behaviour in any -related forum, mailing list, IRC channel, wiki, web site, public +These Guidelines for Conduct, originally based on [the LibrePlanet +Code of Conduct](//libreplanet.org/wiki/LibrePlanet:About/Code_of_Conduct), +apply to us as participants in any conferences, campaigns, projects, +and communities under the EmacsConf name, and covers our behaviour in +any related forum, mailing list, IRC channel, wiki, web site, public meeting, or private correspondence. # Rules |