Merge remote-tracking branch 'origin/Flickr-engine' into Flickr-engine
Conflicts:
searx/engines/flickr.py
searx/settings.yml
commit17fd4ea4e72ad7ace3658446d149882e605bda43
authorCqoicebordel <Cqoicebordel@users.noreply.github.com>
dateTue 16 Dec 2014, 20:44 (12 years ago)
parent930f724cfdcbdd