Merge branch 'master' into dependabot/pip/master/pylint-2.10.2
commitfd1e49c9b6a7d39cf00653d6dce6b540c12cd371
authorNoémi Ványi <kvch@users.noreply.github.com>
dateSun 22 Aug 2021, 21:11 (5 years ago)
parente271d6d603dfad
requirements.txt+2−2
@@ -2,12 +2,12 @@ certifi==2021.5.30
22babel==2.9.1
33flask-babel==2.0.0
44flask==1.1.2
5−jinja2==2.11.3
5+jinja2==3.0.1
66lxml==4.6.3
77pygments==2.8.0
88python-dateutil==2.8.2
99pyyaml==5.4.1
10−httpx[http2]==0.17.1
10+httpx[http2]==0.19.0
1111Brotli==1.0.9
1212uvloop==0.16.0; python_version >= '3.7'
1313uvloop==0.14.0; python_version < '3.7'
searx/webapp.py+1
@@ -1117,6 +1117,7 @@ def config():
11171117 'brand': {
11181118 'CONTACT_URL': brand.CONTACT_URL,
11191119 'GIT_URL': brand.GIT_URL,
1120+ 'GIT_BRANCH': brand.GIT_BRANCH,
11201121 'DOCS_URL': brand.DOCS_URL
11211122 },
11221123 'doi_resolvers': [r for r in settings['doi_resolvers']],