Merge branch 'master' of https://github.com/asciimoo/searx into feature/seedpeer-engine-integration

Resolved conflict searx/settings.yml

27 files changed, 0 insertions, 0 deletions

diff --git a/searx/static/themes/legacy/img/icons/icon_500px.ico b/searx/static/themes/legacy/img/icons/icon_500px.ico
new file mode 100644
index 000000000..b01aa20b5
--- /dev/null
+++ b/searx/static/themes/legacy/img/icons/icon_500px.ico
diff --git a/searx/static/themes/legacy/img/icons/icon_bing.ico b/searx/static/themes/legacy/img/icons/icon_bing.ico
new file mode 100644
index 000000000..5702749c1
--- /dev/null
+++ b/searx/static/themes/legacy/img/icons/icon_bing.ico
diff --git a/searx/static/themes/legacy/img/icons/icon_dailymotion.ico b/searx/static/themes/legacy/img/icons/icon_dailymotion.ico
new file mode 100644
index 000000000..b161a57fb
--- /dev/null
+++ b/searx/static/themes/legacy/img/icons/icon_dailymotion.ico
diff --git a/searx/static/themes/legacy/img/icons/icon_deezer.ico b/searx/static/themes/legacy/img/icons/icon_deezer.ico
new file mode 100644
index 000000000..d38c9b1f6
--- /dev/null
+++ b/searx/static/themes/legacy/img/icons/icon_deezer.ico
diff --git a/searx/static/themes/legacy/img/icons/icon_deviantart.ico b/searx/static/themes/legacy/img/icons/icon_deviantart.ico
new file mode 100644
index 000000000..26c353325
--- /dev/null
+++ b/searx/static/themes/legacy/img/icons/icon_deviantart.ico
diff --git a/searx/static/themes/legacy/img/icons/icon_digg.ico b/searx/static/themes/legacy/img/icons/icon_digg.ico
new file mode 100644
index 000000000..162e57038
--- /dev/null
+++ b/searx/static/themes/legacy/img/icons/icon_digg.ico
diff --git a/searx/static/themes/legacy/img/icons/icon_duckduckgo.ico b/searx/static/themes/legacy/img/icons/icon_duckduckgo.ico
new file mode 100644
index 000000000..d093082cb
--- /dev/null
+++ b/searx/static/themes/legacy/img/icons/icon_duckduckgo.ico
diff --git a/searx/static/themes/legacy/img/icons/icon_flickr.ico b/searx/static/themes/legacy/img/icons/icon_flickr.ico
new file mode 100644
index 000000000..e2304c587
--- /dev/null
+++ b/searx/static/themes/legacy/img/icons/icon_flickr.ico
diff --git a/searx/static/themes/legacy/img/icons/icon_github.ico b/searx/static/themes/legacy/img/icons/icon_github.ico
new file mode 100644
index 000000000..133f0ca35
--- /dev/null
+++ b/searx/static/themes/legacy/img/icons/icon_github.ico
diff --git a/searx/static/themes/legacy/img/icons/icon_google play apps.ico b/searx/static/themes/legacy/img/icons/icon_google play apps.ico
new file mode 100644
index 000000000..74c84470b
--- /dev/null
+++ b/searx/static/themes/legacy/img/icons/icon_google play apps.ico
diff --git a/searx/static/themes/legacy/img/icons/icon_google play movies.ico b/searx/static/themes/legacy/img/icons/icon_google play movies.ico
new file mode 100644
index 000000000..74c84470b
--- /dev/null
+++ b/searx/static/themes/legacy/img/icons/icon_google play movies.ico
diff --git a/searx/static/themes/legacy/img/icons/icon_google play music.ico b/searx/static/themes/legacy/img/icons/icon_google play music.ico
new file mode 100644
index 000000000..74c84470b
--- /dev/null
+++ b/searx/static/themes/legacy/img/icons/icon_google play music.ico
diff --git a/searx/static/themes/legacy/img/icons/icon_google.ico b/searx/static/themes/legacy/img/icons/icon_google.ico
new file mode 100644
index 000000000..f594697d2
--- /dev/null
+++ b/searx/static/themes/legacy/img/icons/icon_google.ico
diff --git a/searx/static/themes/legacy/img/icons/icon_kickass.ico b/searx/static/themes/legacy/img/icons/icon_kickass.ico
new file mode 100644
index 000000000..4aa2c77a5
--- /dev/null
+++ b/searx/static/themes/legacy/img/icons/icon_kickass.ico
diff --git a/searx/static/themes/legacy/img/icons/icon_openstreetmap.ico b/searx/static/themes/legacy/img/icons/icon_openstreetmap.ico
new file mode 100644
index 000000000..b65863656
--- /dev/null
+++ b/searx/static/themes/legacy/img/icons/icon_openstreetmap.ico
diff --git a/searx/static/themes/legacy/img/icons/icon_searchcode code.ico b/searx/static/themes/legacy/img/icons/icon_searchcode code.ico
new file mode 100644
index 000000000..dc099ef70
--- /dev/null
+++ b/searx/static/themes/legacy/img/icons/icon_searchcode code.ico
diff --git a/searx/static/themes/legacy/img/icons/icon_searchcode doc.ico b/searx/static/themes/legacy/img/icons/icon_searchcode doc.ico
new file mode 100644
index 000000000..dc099ef70
--- /dev/null
+++ b/searx/static/themes/legacy/img/icons/icon_searchcode doc.ico
diff --git a/searx/static/themes/legacy/img/icons/icon_searchcode.ico b/searx/static/themes/legacy/img/icons/icon_searchcode.ico
new file mode 100644
index 000000000..dc099ef70
--- /dev/null
+++ b/searx/static/themes/legacy/img/icons/icon_searchcode.ico
diff --git a/searx/static/themes/legacy/img/icons/icon_soundcloud.ico b/searx/static/themes/legacy/img/icons/icon_soundcloud.ico
new file mode 100644
index 000000000..4130bea1b
--- /dev/null
+++ b/searx/static/themes/legacy/img/icons/icon_soundcloud.ico
diff --git a/searx/static/themes/legacy/img/icons/icon_stackoverflow.ico b/searx/static/themes/legacy/img/icons/icon_stackoverflow.ico
new file mode 100644
index 000000000..b2242bc6c
--- /dev/null
+++ b/searx/static/themes/legacy/img/icons/icon_stackoverflow.ico
diff --git a/searx/static/themes/legacy/img/icons/icon_startpage.ico b/searx/static/themes/legacy/img/icons/icon_startpage.ico
new file mode 100644
index 000000000..44b94a986
--- /dev/null
+++ b/searx/static/themes/legacy/img/icons/icon_startpage.ico
diff --git a/searx/static/themes/legacy/img/icons/icon_subtitleseeker.ico b/searx/static/themes/legacy/img/icons/icon_subtitleseeker.ico
new file mode 100644
index 000000000..9a0565558
--- /dev/null
+++ b/searx/static/themes/legacy/img/icons/icon_subtitleseeker.ico
diff --git a/searx/static/themes/legacy/img/icons/icon_twitter.ico b/searx/static/themes/legacy/img/icons/icon_twitter.ico
new file mode 100644
index 000000000..b4a71699a
--- /dev/null
+++ b/searx/static/themes/legacy/img/icons/icon_twitter.ico
diff --git a/searx/static/themes/legacy/img/icons/icon_vimeo.ico b/searx/static/themes/legacy/img/icons/icon_vimeo.ico
new file mode 100644
index 000000000..4fe4336da
--- /dev/null
+++ b/searx/static/themes/legacy/img/icons/icon_vimeo.ico
diff --git a/searx/static/themes/legacy/img/icons/icon_wikipedia.ico b/searx/static/themes/legacy/img/icons/icon_wikipedia.ico
new file mode 100644
index 000000000..e70021849
--- /dev/null
+++ b/searx/static/themes/legacy/img/icons/icon_wikipedia.ico
diff --git a/searx/static/themes/legacy/img/icons/icon_yahoo.ico b/searx/static/themes/legacy/img/icons/icon_yahoo.ico
new file mode 100644
index 000000000..9bd1d9f7c
--- /dev/null
+++ b/searx/static/themes/legacy/img/icons/icon_yahoo.ico
diff --git a/searx/static/themes/legacy/img/icons/icon_youtube.ico b/searx/static/themes/legacy/img/icons/icon_youtube.ico
new file mode 100644
index 000000000..977887dbb
--- /dev/null
+++ b/searx/static/themes/legacy/img/icons/icon_youtube.ico