Merge branch 'unit-tests' of https://github.com/Cqoicebordel/searx into Cqoicebordel-unit-tests

Conflicts: searx/tests/test_engines.py
2015-02-02 09:36:43 +01:00
parent 03137eebd9 5a16077455
commit 7f865356f9
45 changed files with 3692 additions and 71 deletions
--- a/searx/settings.yml
+++ b/searx/settings.yml
@@ -161,9 +161,9 @@ engines:
    engine : photon
    shortcut : ph

-#  - name : piratebay
-#    engine : piratebay
-#    shortcut : tpb
+  - name : piratebay
+    engine : piratebay
+    shortcut : tpb

  - name : kickass
    engine : kickass