 Pydo
|
55a5b686ed
|
Merge branch 'master' of https://github.com/asciimoo/searx into feature/seedpeer-engine-integration
Resolved conflict searx/settings.yml
|
2016-10-01 10:46:18 -04:00 |
|
|
Pydo
|
6f87bf2a1c
|
Disabled seepeer.eu by default since it does not support https
|
2016-10-01 10:28:01 -04:00 |
|
|
Pydo
|
ec4a03628e
|
Put html fixture in file to be pep8 line length compliant
|
2016-09-05 15:37:20 -04:00 |
|
|
Pydo
|
41ce76e9c9
|
Merge branch 'master' of https://github.com/asciimoo/searx into feature/seedpeer-engine-integration
|
2016-09-05 14:56:53 -04:00 |
|
|
Pydo
|
2c2123b2e8
|
Added seepeer to config and added seepeer search parser
|
2016-09-05 14:51:02 -04:00 |
|
|
Pydo
|
aa85045a7d
|
Added seedpeer unitests
|
2016-09-05 14:50:26 -04:00 |
|