Required some fixes due to merge conflicts with #6739, but nothing too hairy. The first commit is the same as the original (after merge conflict resolution) then two more for compatibility with the latest sync code. |
||
|---|---|---|
| .. | ||
| __init__.py | ||
| test_consent.py | ||
| test_resource_limits_server_notices.py | ||