mirror of
https://github.com/searxng/searxng.git
synced 2024-12-24 02:00:29 +00:00
Merge remote-tracking branch 'origin/Flickr-engine' into Flickr-engine
Conflicts: searx/engines/flickr.py searx/settings.yml
This commit is contained in:
commit
17fd4ea4e7