You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
searxng/searx
Thomas Pointhuber 0e1035eac1 Merge https://github.com/asciimoo/searx into template_oscar
Conflicts:
	searx/translations/de/LC_MESSAGES/messages.po
	searx/translations/en/LC_MESSAGES/messages.po
	searx/translations/es/LC_MESSAGES/messages.po
	searx/translations/fr/LC_MESSAGES/messages.po
	searx/translations/hu/LC_MESSAGES/messages.po
	searx/translations/it/LC_MESSAGES/messages.po
	searx/translations/nl/LC_MESSAGES/messages.po
	searx/webapp.py
10 years ago
..
engines Merge https://github.com/asciimoo/searx into template_oscar 10 years ago
https_rules import basic https rules from https-everywhere repository 10 years ago
static Merge https://github.com/asciimoo/searx into template_oscar 10 years ago
templates oscar template: add infobox 10 years ago
tests [fix] infoboxes and answers : pass all tests 10 years ago
translations Merge https://github.com/asciimoo/searx into template_oscar 10 years ago
__init__.py [fix] pep8 part II. 10 years ago
autocomplete.py update comments in autocomplete.py 10 years ago
https_rewrite.py print error if https rewrite directory is not found, #116 10 years ago
languages.py add comments to languages.py 10 years ago
query.py [fix] pep8 part II. 10 years ago
search.py [fix] pep8 part II. 10 years ago
settings.yml Merge pull request #115 from pointhi/engine_faroo 10 years ago
settings_robot.yml update settings_robot.yml 10 years ago
testing.py fix: robot fw, entry points, some flake8, package searx egg 11 years ago
utils.py [fix] pep8 part II. 10 years ago
webapp.py Merge https://github.com/asciimoo/searx into template_oscar 10 years ago