Conflicts: tests/rest/test_presence.py tests/rest/test_rooms.py tests/utils.py |
||
|---|---|---|
| .. | ||
| __init__.py | ||
| handler.py | ||
| pdu_codec.py | ||
| persistence.py | ||
| replication.py | ||
| transport.py | ||
| units.py | ||
Conflicts: tests/rest/test_presence.py tests/rest/test_rooms.py tests/utils.py |
||
|---|---|---|
| .. | ||
| __init__.py | ||
| handler.py | ||
| pdu_codec.py | ||
| persistence.py | ||
| replication.py | ||
| transport.py | ||
| units.py | ||