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

Skip to content
Commit 05be069f authored by Adam Tauber's avatar Adam Tauber
Browse files

Merge branch 'integrated-videos' of https://github.com/Cqoicebordel/searx into... 

Merge branch 'integrated-videos' of https://github.com/Cqoicebordel/searx into Cqoicebordel-integrated-videos

Conflicts:
	searx/engines/vimeo.py
parents 3b672039 a723936a
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