Fix merge conflicts

This commit is contained in:
Griatch 2021-06-19 12:40:30 +02:00
commit 4a712e6b5f
6 changed files with 36 additions and 6 deletions

View file

@ -66,7 +66,8 @@ Up requirements to Django 3.2+
into a more consistent structure for overriding. Expanded webpage documentation considerably.
- REST API list-view was shortened (#2401). New CSS/HTML. Add ReDoc for API autodoc page.
- Update and fix dummyrunner with cleaner code and setup.
- Made `iter_to_str` format prettier strings
- Made `iter_to_str` format prettier strings, using Oxford comma.
- Added an MXP anchor tag to also support clickable web links.
### Evennia 0.9.5 (2019-2020)