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

Skip to content
Commit 55a5b686 authored by Pydo's avatar Pydo
Browse files

Merge branch 'master' of https://github.com/asciimoo/searx into feature/seedpeer-engine-integration 

Resolved conflict searx/settings.yml
parents 6f87bf2a 295fc9ce
Hide 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