Tim McCormack 5b331b2d4d Merge branch 'master' into timmc/misc-metric-attribute ...

# Conflicts:
#	cms/envs/common.py
#	lms/envs/common.py

2020-09-28 13:56:08 +00:00

..

docs/decisions

…

migrations

…

tests

Revert "Revert "ARCHBOM-1494: Refer to custom attributes, not metrics, especially with edx-django-utils (#25010)" (#25025)" (#25055)

2020-09-28 13:53:57 +00:00

__init__.py

Revert "Revert "ARCHBOM-1494: Refer to custom attributes, not metrics, especially with edx-django-utils (#25010)" (#25025)" (#25055)

2020-09-28 13:53:57 +00:00

admin.py

…

forms.py

…

models.py

…

testutils.py

…

urls.py

…

views.py

…