Merge branch 'master' into robrap/upgrade-edx-drf-extensions-89c8f21

requirements/constraints.txt

@@ -26,7 +26,7 @@ django-storages==1.14
 # The team that owns this package will manually bump this package rather than having it pulled in automatically.
 # This is to allow them to better control its deployment and to do it in a process that works better
 # for them.
-edx-enterprise==4.6.11
+edx-enterprise==4.6.12
 
 # django-oauth-toolkit version >=2.0.0 has breaking changes. More details
 # mentioned on this issue https://github.com/openedx/edx-platform/issues/32884

requirements/edx/base.txt

@@ -482,7 +482,7 @@ edx-drf-extensions==8.13.0
     #   edx-when
     #   edxval
     #   openedx-learning
-edx-enterprise==4.6.11
+edx-enterprise==4.6.12
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/kernel.in

requirements/edx/development.txt

@@ -752,7 +752,7 @@ edx-drf-extensions==8.13.0
     #   edx-when
     #   edxval
     #   openedx-learning
-edx-enterprise==4.6.11
+edx-enterprise==4.6.12
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt

requirements/edx/doc.txt

@@ -558,7 +558,7 @@ edx-drf-extensions==8.13.0
     #   edx-when
     #   edxval
     #   openedx-learning
-edx-enterprise==4.6.11
+edx-enterprise==4.6.12
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt

requirements/edx/testing.txt

@@ -583,7 +583,7 @@ edx-drf-extensions==8.13.0
     #   edx-when
     #   edxval
     #   openedx-learning
-edx-enterprise==4.6.11
+edx-enterprise==4.6.12
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt