Merge branch 'main' into main

pytest-dev · Jun 6, 2024 · e3eefe1 · e3eefe1
2 parents 8f61d5d + 043ff9a
commit e3eefe1
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/doc/en/contact.rst b/doc/en/contact.rst
@@ -26,19 +26,12 @@ Contact channels
   <https://web.libera.chat/#pytest>`_, or `via Matrix
   <https://matrix.to/#/%23pytest:libera.chat>`_).
 
-- private mail to Holger.Krekel at gmail com if you want to communicate sensitive issues
-
-
-- `merlinux.eu`_ offers pytest and tox-related professional teaching and
-  consulting.
 
 .. _`pytest issue tracker`: https://github.com/pytest-dev/pytest/issues
 .. _`old issue tracker`: https://bitbucket.org/hpk42/py-trunk/issues/
 
 .. _`pytest discussions`: https://github.com/pytest-dev/pytest/discussions
 
-.. _`merlinux.eu`: https://merlinux.eu/
-
 .. _`get an account`:
 
 .. _tetamap: https://tetamap.wordpress.com/