diff options
| author | Pydo <pydo@tutanota.com> | 2016-10-01 10:46:18 -0400 |
|---|---|---|
| committer | Pydo <pydo@tutanota.com> | 2016-10-01 10:46:18 -0400 |
| commit | 55a5b686ed6dc0b9a6bfc45e0eaf1f70e24f2aea (patch) | |
| tree | 96e953057dd3fc29681039f7ac5b282dac189ee8 /AUTHORS.rst | |
| parent | 6f87bf2a1c76f1b94ad2119df7fb938c2307e370 (diff) | |
| parent | 295fc9ce96d8cca9c6c4776a00e5fb0942eb6f4d (diff) | |
Merge branch 'master' of https://github.com/asciimoo/searx into feature/seedpeer-engine-integration
Resolved conflict searx/settings.yml
Diffstat (limited to 'AUTHORS.rst')
| -rw-r--r-- | AUTHORS.rst | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/AUTHORS.rst b/AUTHORS.rst index f3e875ada..505b28eeb 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -1,4 +1,4 @@ -Searx was created by Adam Tauber and is maintained by Adam Tauber and Alexandre Flament. +Searx was created by Adam Tauber and is maintained by Adam Tauber, Alexandre Flament and Noémi Ványi. Major contributing authors: @@ -7,6 +7,7 @@ Major contributing authors: - Thomas Pointhuber - Alexandre Flament `@dalf <https://github.com/dalf>`_ - @Cqoicebordel +- Noémi Ványi People who have submitted patches/translates, reported bugs, consulted features or generally made searx better: @@ -39,12 +40,10 @@ generally made searx better: - @underr - Emmanuel Benazera - @GreenLunar -- Noemi Vanyi - Kang-min Liu - Kirill Isakov - Guilhem Bonnefille - Marc Abonce Seguin - - @jibe-b - Christian Pietsch @pietsch - @Maxqia @@ -52,3 +51,10 @@ generally made searx better: - YuLun Shih @imZack - Dmitry Mikhirev @mikhirev - David A Roberts `@davidar <https://github.com/davidar>`_ +- Jan Verbeek @blyxxyz +- Ammar Najjar @ammarnajjar +- @stepshal +- François Revol @mmuman +- marc @a01200356 +- Harry Wood @harry-wood +- Thomas Renard @threnard |