diff options
| author |  kwzrd <[email protected]> | 2020-07-16 17:37:14 +0200 |
|---|---|---|
| committer | kwzrd <[email protected]> | 2020-07-16 17:37:14 +0200 |
| commit | 8af804862475c657211327d76be2a67f04589399 (patch) | |
| tree | 0983f2580e450d6cf92104c736af699d7199a667 /tests/base.py | |
| parent | Incidents: reduce log level of 404 exception (diff) | |
| parent | Merge pull request #1046 from ItsCinnabar/patch-1 (diff) | |
Merge 'master' into 'kwzrd/incidents'; resolve config conflicts
Add upstream changes & resolve config conflicts introduced by #1041.
In the conflicting parts of the diff, this commit also re-sorts
constants which were added upstream to lexicographical order.
This does **not** re-sort all constants added upstream.
Diffstat (limited to 'tests/base.py')
0 files changed, 0 insertions, 0 deletions