diff options
| author | Adam Tauber <asciimoo@gmail.com> | 2014-12-24 20:34:08 +0100 |
|---|---|---|
| committer | Adam Tauber <asciimoo@gmail.com> | 2014-12-24 20:34:08 +0100 |
| commit | ada01cb367fbb226397c0542ca30684581e38568 (patch) | |
| tree | c3ec0192d58fbd4e80b0be37af8825937d1bf339 /searx/https_rules/Github.xml | |
| parent | 5857141e498e80c1528ac13091ae374e807cbf75 (diff) | |
| parent | 83d6f366596829f2140f84c73b684bd7f783e93c (diff) | |
Merge branch 'Detect-favicons' of https://github.com/Cqoicebordel/searx into Cqoicebordel-Detect-favicons
Conflicts:
searx/templates/courgette/result_templates/default.html
searx/templates/courgette/result_templates/map.html
searx/templates/courgette/result_templates/videos.html
searx/templates/default/result_templates/default.html
searx/templates/default/result_templates/map.html
searx/templates/default/result_templates/videos.html
searx/webapp.py
Diffstat (limited to 'searx/https_rules/Github.xml')
0 files changed, 0 insertions, 0 deletions