Bruno Alla 4e96b64261 Merge branch 'master' into fix_django_31 ... # Conflicts: # {{cookiecutter.project_slug}}/requirements/base.txt		2021-02-23 19:10:52 +00:00
..
contrib	Update Django to 3.1.7	2021-02-21 17:55:05 +01:00
static	Update project.js	2018-07-11 10:43:19 +00:00
templates	Merge pull request #2992 from Andrew-Chen-Wang/patch-3	2021-02-23 08:43:33 +00:00
users	Remove email from User API Test	2021-02-16 18:35:47 -05:00
utils	Update {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/context_processors.py	2020-07-24 11:29:11 -04:00
__init__.py	First pass at running black across the project (#1602)	2018-04-08 17:03:29 -05:00
conftest.py	Remove request_factory fixture, use the rf one from pytest-django	2020-03-26 18:21:11 +00:00