diff options
author | 2020-02-29 13:56:44 +0100 | |
---|---|---|
committer | 2020-02-29 13:56:44 +0100 | |
commit | b36879cedf1046a480ea884ddb977836eab92a96 (patch) | |
tree | 22155e9e8635dadde5439b134fdad738b6d98a0d /tests/test_base.py | |
parent | Use MagicMock as return value for _get_diff mock (diff) | |
parent | Merge pull request #755 from python-discord/bug/backend/b754/scheduler-suppre... (diff) |
Merge branch 'master' into python38-migration
I've resolved the merge conflict by confirming the deleted part of tests/helpers.py
Diffstat (limited to 'tests/test_base.py')
0 files changed, 0 insertions, 0 deletions