Permalink
Browse files

Merge branch 'master' into fix-engine-suspend-time

  • Loading branch information...
kvch committed Jan 29, 2019
2 parents 3679016 + 0ac1177 commit 83342a2878d4e677c98736c424eec85ff3a9cb4e
Showing with 3 additions and 48 deletions.
  1. +0 −44 searx/engines/asksteem.py
  2. +0 −4 searx/settings.yml
  3. +3 −0 searx/webapp.py

This file was deleted.

Oops, something went wrong.
@@ -70,10 +70,6 @@ engines:
categories : science
timeout : 4.0

- name : asksteem
engine : asksteem
shortcut : as

- name : base
engine : base
shortcut : bs
@@ -295,6 +295,9 @@ def image_proxify(url):
if not request.preferences.get_value('image_proxy'):
return url

if url.startswith('data:image/jpeg;base64,'):
return url

if settings.get('result_proxy'):
return proxify(url)

0 comments on commit 83342a2

Please sign in to comment.