mirrors/searxng
1
0
Fork 0
mirror of https://github.com/searxng/searxng.git synced 2024-11-05 09:00:02 +00:00
Code Issues Projects Releases Wiki Activity
searxng/searx/templates
History
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
2015-01-09 21:30:09 +01:00
..
courgette Merge branch 'master' of https://github.com/asciimoo/searx into code_results 2015-01-09 21:30:09 +01:00
default Merge branch 'master' of https://github.com/asciimoo/searx into code_results 2015-01-09 21:30:09 +01:00
oscar Merge branch 'master' of https://github.com/asciimoo/searx into code_results 2015-01-09 21:30:09 +01:00