Merge branch 'master' into add_ccctv_to_settings

This commit is contained in:
Stefan Antoni 2016-12-25 14:59:52 +01:00 committed by GitHub
commit e6d69b082f
2 changed files with 66 additions and 0 deletions

View file

@ -174,6 +174,7 @@ engines:
suggestion_xpath : //a[@class="crossreference"]
first_page_num : 0
shortcut : et
disabled : True
# api-key required: http://www.faroo.com/hp/api/api.html#key
# - name : faroo
@ -451,6 +452,14 @@ engines:
shortcut : scc
disabled : True
# - name : searx
# engine : searx_engine
# shortcut : se
# instance_urls :
# - http://127.0.0.1:8888/
# - ...
# disabled : True
- name : spotify
engine : spotify
shortcut : stf