Resolve merge conflicts

This commit is contained in:
Griatch 2022-08-05 20:45:40 +02:00
commit e84933d452
7 changed files with 23 additions and 21 deletions

View file

@ -178,8 +178,6 @@ Up requirements to Django 4.0+, Twisted 22+, Python 3.9 or 3.10
move being done ('teleport', 'disembark', 'give' etc). (volund)
- Made RPSystem contrib msg calls pass `pose` or `say` as msg-`type` for use in
e.g. webclient pane filtering where desired. (volund)
- Added `Account.uses_screenreader(session=None)` as a quick shortcut for
finding if a user uses a screenreader (and adjust display accordingly).
- Fixed bug in `cmdset.remove()` where a command could not be deleted by `key`,
even though doc suggested one could (ChrisLR)
- New contrib `name_generator` for building random real-world based or fantasy-names