diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 002de2d250..eb45275b10 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -62,7 +62,7 @@ When using the OpenStreetMap Carto spaces you should act in the spirit of the va The OpenStreetMap Carto maintainers are responsible for handling conduct-related issues. Their goal is to de-escalate conflicts and try to resolve issues to the satisfaction of all parties. -If you encounter a conduct-related issue, you should report it to the maintainers by sending them [all an email](mailto:openstreetmap-carto@gravitystorm.co.uk,penorman@mac.com,info@matthijsmelissen.nl,matkoniecz@gmail.com,chris_hormann@gmx.de,daniel@xn--ko-wla.pl). +If you encounter a conduct-related issue, you should report it to the maintainers by sending them [all an email](mailto:openstreetmap-carto@gravitystorm.co.uk,penorman@mac.com,info@matthijsmelissen.nl,matkoniecz@gmail.com,chris_hormann@gmx.de,daniel@xn--ko-wla.pl,sommerluk@gmail.com,joseph.eisenberg@gmail.com). **Note that the goal of the Code of Conduct and the maintainers is to resolve conflicts in the most harmonious way possible.** We hope that in most cases issues may be resolved through polite discussion and mutual agreement. Bans and other forceful measures are to be employed only as a last resort. diff --git a/README.md b/README.md index 5fc367d28b..b28920126f 100644 --- a/README.md +++ b/README.md @@ -92,3 +92,4 @@ maps using Mapnik, many based on this project. Some alternatives are: * Daniel Koć [@kocio-pl](https://github.com/kocio-pl) * Christoph Hormann [@imagico](https://github.com/imagico) * Lukas Sommer [@sommerluk](https://github.com/sommerluk) +* Joseph Eisenberg [@jeisenbe](https://github.com/jeisenbe)