diff options
| author | Thomas Pointhuber <thomas.pointhuber@gmx.at> | 2014-10-26 19:11:28 +0100 |
|---|---|---|
| committer | Thomas Pointhuber <thomas.pointhuber@gmx.at> | 2014-10-26 19:11:28 +0100 |
| commit | 0e1035eac1a3359edb44c998abc7f76d6f7ad985 (patch) | |
| tree | 3ef91532383f713324239a6797f0219da129236f /searx/https_rules/GoogleMelange.xml | |
| parent | c36c935b03cc87ddfcac5ce3ded333be73387a7a (diff) | |
| parent | 79f1676e318d36704687966fd124b7f29ddc21fa (diff) | |
| download | searxng-0e1035eac1a3359edb44c998abc7f76d6f7ad985.tar.gz searxng-0e1035eac1a3359edb44c998abc7f76d6f7ad985.zip | |
Merge https://github.com/asciimoo/searx into template_oscar
Conflicts:
searx/translations/de/LC_MESSAGES/messages.po
searx/translations/en/LC_MESSAGES/messages.po
searx/translations/es/LC_MESSAGES/messages.po
searx/translations/fr/LC_MESSAGES/messages.po
searx/translations/hu/LC_MESSAGES/messages.po
searx/translations/it/LC_MESSAGES/messages.po
searx/translations/nl/LC_MESSAGES/messages.po
searx/webapp.py
Diffstat (limited to 'searx/https_rules/GoogleMelange.xml')
| -rw-r--r-- | searx/https_rules/GoogleMelange.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/searx/https_rules/GoogleMelange.xml b/searx/https_rules/GoogleMelange.xml new file mode 100644 index 000000000..ec23cd45f --- /dev/null +++ b/searx/https_rules/GoogleMelange.xml @@ -0,0 +1,6 @@ +<ruleset name="GoogleMelange"> + <target host="www.google-melange.com" /> + <target host="google-melange.com" /> + + <rule from="^http://(www\.)?google-melange\.com/" to="https://www.google-melange.com/" /> +</ruleset> |