Bruno Alla 39df72669e Merge branch 'master' into upgrade/django-2.1 ... # Conflicts: # README.rst		2019-04-17 08:33:54 +01:00
..
base.txt	Merge branch 'master' into upgrade/django-2.1	2019-04-17 08:33:54 +01:00
local.txt	Update pytest from 4.4.0 to 4.4.1	2019-04-16 12:00:30 +01:00
production.txt	Merge pull request #2024 from pydanny/pyup-update-sentry-sdk-0.7.9-to-0.7.10	2019-04-08 14:58:35 +02:00