mirror of https://github.com/searxng/searxng
Merge remote-tracking branch 'origin/Flickr-engine' into Flickr-engine
Conflicts: searx/engines/flickr.py searx/settings.ymlpull/1/head
commit
17fd4ea4e7
Conflicts: searx/engines/flickr.py searx/settings.ymlpull/1/head