Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 4130b3df authored by a01200356's avatar a01200356
Browse files

Merge branch 'master' of https://github.com/asciimoo/searx 

Conflicts:
	searx/tests/test_engines.py
parents 3bbdb23f 6a158ca2
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment