summaryrefslogtreecommitdiff
path: root/AUTHORS.rst
diff options
context:
space:
mode:
authorMarkus Heiser <markus.heiser@darmarIT.de>2019-12-29 09:47:06 +0100
committerGitHub <noreply@github.com>2019-12-29 09:47:06 +0100
commit36e72a46192235615f63a02984ab88c70145b0ec (patch)
tree0c2e238ed8fd03a95a090692d0d761fe2ea13d79 /AUTHORS.rst
parentb2e1ee8d35050033b41765a2de49c0eea5f8b4b4 (diff)
parentf6d66c0f6f1d8f1f583d9000ee0123450cce8130 (diff)
Merge branch 'master' into fix-engine-spotify
Diffstat (limited to 'AUTHORS.rst')
-rw-r--r--AUTHORS.rst4
1 files changed, 3 insertions, 1 deletions
diff --git a/AUTHORS.rst b/AUTHORS.rst
index 674bfd758..2a2f19219 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -1,4 +1,4 @@
-Searx was created by Adam Tauber and is maintained by Adam Tauber, Alexandre Flament and Noémi Ványi.
+Searx was created by Adam Tauber and is maintained by Adam Tauber, Alexandre Flament, Noémi Ványi, @pofilo and Markus Heiser.
Major contributing authors:
@@ -9,6 +9,8 @@ Major contributing authors:
- @Cqoicebordel
- Noémi Ványi
- Marc Abonce Seguin @a01200356
+- @pofilo
+- Markus Heiser @return42
People who have submitted patches/translates, reported bugs, consulted features or
generally made searx better: