diff options
| author | pw3t <romain@berthor.fr> | 2014-01-23 22:17:19 +0100 |
|---|---|---|
| committer | pw3t <romain@berthor.fr> | 2014-01-23 22:17:19 +0100 |
| commit | b82ba74a7dfba4b3b3d54ecfc6f99e02d473f7d1 (patch) | |
| tree | 45ba9fb8634d7a079fb1199f406b08306106afcb /examples | |
| parent | a01042ae616524160f32bfbca0e833b1de6dab58 (diff) | |
| parent | 1dd35e9916dabd5426f92e5e0921148b439bb376 (diff) | |
Merge branch 'ixquick' of https://github.com/pw3t/searx into ixquick
Conflicts:
searx/engines/startpage.py
Diffstat (limited to 'examples')
0 files changed, 0 insertions, 0 deletions