Bruno Alla 196167490d Merge branch 'master' into docs ... # Conflicts: # {{cookiecutter.project_slug}}/requirements/local.txt		2020-06-29 21:48:17 +01:00
..
base.txt	Update base requirements to latest version	2020-06-21 14:26:40 +01:00
local.txt	Merge branch 'master' into docs	2020-06-29 21:48:17 +01:00
production.txt	Merge pull request #2616 from pydanny/pyup-update-collectfast-2.1.0-to-2.2.0	2020-06-21 14:08:18 +01:00