-
https://github.com/Cqoicebordel/searxAdam Tauber authored
Merge branch 'integrated-videos' of https://github.com/Cqoicebordel/searx into Cqoicebordel-integrated-videos Conflicts: searx/engines/vimeo.py
05be069f
Merge branch 'integrated-videos' of https://github.com/Cqoicebordel/searx into Cqoicebordel-integrated-videos Conflicts: searx/engines/vimeo.py