Merge remote-tracking branch 'origin/Flickr-engine' into Flickr-engine

Conflicts:
	searx/engines/flickr.py
	searx/settings.yml
This commit is contained in:
Cqoicebordel 2014-12-16 20:44:11 +01:00
commit 17fd4ea4e7

Diff content is not available