Merge branch 'filecrop' of https://github.com/pw3t/searx into filecrop

Browse source

Conflicts:
	searx/engines/filecrop.py

...

This commit is contained in:

pw3t 2013-12-29 16:32:13 +01:00

parent b71bddad06 c2092b9fce

commit 016a26c79c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available