diff options
| author | Adam Tauber <asciimoo@gmail.com> | 2015-01-15 18:26:00 +0100 |
|---|---|---|
| committer | Adam Tauber <asciimoo@gmail.com> | 2015-01-15 18:26:00 +0100 |
| commit | a04fafd419bd465c533cc223e4036e1ca0997d5f (patch) | |
| tree | f739d7d4567fcc8b1691bbef24deb9cb13ce7e14 /searx/tests | |
| parent | c5599e3c7c790ac2674b68f99919c0ec284327a3 (diff) | |
| parent | 400b54191c590663f0cfe91045f70a5d9223aa19 (diff) | |
| download | searxng-a04fafd419bd465c533cc223e4036e1ca0997d5f.tar.gz searxng-a04fafd419bd465c533cc223e4036e1ca0997d5f.zip | |
Merge branch 'code_results' of https://github.com/pointhi/searx into pointhi-code_results
Conflicts:
searx/static/themes/default/css/style.css
searx/static/themes/oscar/css/oscar.min.css
searx/templates/oscar/result_templates/torrent.html
Diffstat (limited to 'searx/tests')
0 files changed, 0 insertions, 0 deletions