Bruno Alla ea84b6ccab Merge branch 'master' into update_tests_deprecation ... # Conflicts: # {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py		2021-04-08 18:47:47 +01: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	Fix linting issues in template	2021-04-07 20:57:04 +01:00
users	Merge branch 'master' into update_tests_deprecation	2021-04-08 18:47:47 +01: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