diff options
| author | Thomas Pointhuber <thomas.pointhuber@gmx.at> | 2015-01-09 21:25:13 +0100 |
|---|---|---|
| committer | Thomas Pointhuber <thomas.pointhuber@gmx.at> | 2015-01-09 21:30:09 +0100 |
| commit | 400b54191c590663f0cfe91045f70a5d9223aa19 (patch) | |
| tree | 08c71466ac8fbaf69872f114847baec762f5bd81 /searx/static/themes/oscar/img/icons/twitter.png | |
| parent | af8dac93a8acff5042b7b399c38e348f0bdc32ad (diff) | |
| parent | c8be128e97479ea6c871c4b6fbf014fa8136e708 (diff) | |
| download | searxng-400b54191c590663f0cfe91045f70a5d9223aa19.tar.gz searxng-400b54191c590663f0cfe91045f70a5d9223aa19.zip | |
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
Diffstat (limited to 'searx/static/themes/oscar/img/icons/twitter.png')
| -rw-r--r-- | searx/static/themes/oscar/img/icons/twitter.png | bin | 0 -> 3790 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/searx/static/themes/oscar/img/icons/twitter.png b/searx/static/themes/oscar/img/icons/twitter.png Binary files differnew file mode 100644 index 000000000..f71c1973a --- /dev/null +++ b/searx/static/themes/oscar/img/icons/twitter.png |