diff options
| author | Adam Tauber <asciimoo@gmail.com> | 2015-04-26 20:14:40 +0200 |
|---|---|---|
| committer | Adam Tauber <asciimoo@gmail.com> | 2015-04-26 20:14:40 +0200 |
| commit | 41e00e65a5ca8125fa3a06991109a671021d5c57 (patch) | |
| tree | e2734c38a651df6b41cf27ffb2a560005a336080 /searx/engines/deezer.py | |
| parent | 5c5ff19ec116062dc8c31e51af3f26fca041a445 (diff) | |
| parent | 6ee35145caccab29a12e32e815bfd838579b35db (diff) | |
| download | searxng-41e00e65a5ca8125fa3a06991109a671021d5c57.tar.gz searxng-41e00e65a5ca8125fa3a06991109a671021d5c57.zip | |
Merge branch 'oscar-cookies' of https://github.com/Cqoicebordel/searx into Cqoicebordel-oscar-cookies
Conflicts:
searx/templates/oscar/preferences.html
Diffstat (limited to 'searx/engines/deezer.py')
0 files changed, 0 insertions, 0 deletions