diff options
| author | Pydo <pydo@tutanota.com> | 2016-10-01 10:46:18 -0400 |
|---|---|---|
| committer | Pydo <pydo@tutanota.com> | 2016-10-01 10:46:18 -0400 |
| commit | 55a5b686ed6dc0b9a6bfc45e0eaf1f70e24f2aea (patch) | |
| tree | 96e953057dd3fc29681039f7ac5b282dac189ee8 /searx/templates/pix-art | |
| parent | 6f87bf2a1c76f1b94ad2119df7fb938c2307e370 (diff) | |
| parent | 295fc9ce96d8cca9c6c4776a00e5fb0942eb6f4d (diff) | |
Merge branch 'master' of https://github.com/asciimoo/searx into feature/seedpeer-engine-integration
Resolved conflict searx/settings.yml
Diffstat (limited to 'searx/templates/pix-art')
| -rw-r--r-- | searx/templates/pix-art/preferences.html | 2 | ||||
| -rw-r--r-- | searx/templates/pix-art/stats.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/searx/templates/pix-art/preferences.html b/searx/templates/pix-art/preferences.html index a4a6cd268..ea5557b07 100644 --- a/searx/templates/pix-art/preferences.html +++ b/searx/templates/pix-art/preferences.html @@ -1,4 +1,4 @@ -{% extends "default/base.html" %} +{% extends "legacy/base.html" %} {% block head %} {% endblock %} {% block content %} <div class="row"> diff --git a/searx/templates/pix-art/stats.html b/searx/templates/pix-art/stats.html index 70fe98ac7..372447e23 100644 --- a/searx/templates/pix-art/stats.html +++ b/searx/templates/pix-art/stats.html @@ -1,4 +1,4 @@ -{% extends "default/base.html" %} +{% extends "legacy/base.html" %} {% block head %} {% endblock %} {% block content %} <h2>{{ _('Engine stats') }}</h2> |