Commit 5f681b4f authored by Nicola Soranzo's avatar Nicola Soranzo
Browse files

Merge branch 'release_20.01' into release_20.05

parents b83dbebd 3697c516

lib/galaxy/dependencies/pipfiles/default/pinned-dev-requirements.txt

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ idna==2.9 
imagesize==1.2.0

importlib-metadata==1.6.0 ; python_version < '3.8'

jinja2==2.11.2

lxml==4.5.0

lxml==4.6.2

markdown==3.1.1

markupsafe==1.1.1

mirakuru==1.1.0

lib/galaxy/dependencies/pipfiles/default/pinned-requirements.txt

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ jsonschema==3.2.0 
keystoneauth1==4.0.0

kombu==4.6.11

lockfile==0.12.2

lxml==4.5.0

lxml==4.6.2

mako==1.1.2

markdown==3.1.1

markupsafe==1.1.1