summaryrefslogtreecommitdiff
path: root/AUTHORS.rst
diff options
context:
space:
mode:
authorMarkus Heiser <markus.heiser@darmarit.de>2019-12-10 17:35:23 +0100
committerMarkus Heiser <markus.heiser@darmarit.de>2019-12-10 17:35:23 +0100
commit9988cdcbc514f799c5a2d2a111c82b8a123bbae3 (patch)
tree4f6701f3b443c617e5646b2a9dff3ab55c3084bc /AUTHORS.rst
parent56b7e05721394c0490ff43960cb7fa5626e83e3d (diff)
parent50e1fcaa5e7369a64829552fc96cd24c787706c9 (diff)
Merge branch 'master' of https://github.com/asciimoo/searx into dos2unix
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
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: