Merge branch 'master' into patch-2

This commit is contained in:
Adam Tauber
2018-08-19 13:22:22 +02:00
committed by GitHub
123 changed files with 3754 additions and 1693 deletions

View File

@@ -1,4 +1,4 @@
FROM alpine:3.6
FROM alpine:3.7
LABEL maintainer="searx <https://github.com/asciimoo/searx>"
LABEL description="A privacy-respecting, hackable metasearch engine."