Commit Graph

5 Commits (4f14f6cd26f25ea6f99408daa7b9db212933908d)

Author SHA1 Message Date
Cqoicebordel 4f14f6cd26 New icons for Courgette 10 years ago
Adam Tauber a04fafd419 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
10 years ago
Adam Tauber 410dbc573b [enh] static content generalization 10 years ago
Thomas Pointhuber 400b54191c Merge branch 'master' of https://github.com/asciimoo/searx into code_results
Conflicts:
	searx/engines/searchcode_code.py
	searx/engines/searchcode_doc.py
	searx/static/oscar/js/searx.min.js
	searx/templates/oscar/result_templates/default.html
	searx/templates/oscar/result_templates/images.html
	searx/templates/oscar/result_templates/map.html
	searx/templates/oscar/result_templates/torrent.html
	searx/templates/oscar/result_templates/videos.html
10 years ago
Adam Tauber 9f12605f7e [enh] themes static content refactor 10 years ago