Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve merge conflicts

Browse source
This commit is contained in:
Griatch 2020-10-08 23:35:31 +02:00
commit 90a1a0cba8
35 changed files with 2766 additions and 973 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/source/index.md
View file

@ -7,7 +7,7 @@
2020-06-12 22:36:53. There are known conversion issues and missing links.
This will slowly be ironed out as this is developed.
For now you are best off using the original wiki, or the less changing v0.9.1
For now you are best off using the original wiki, or the less changing v0.9.5
of these docs. You have been warned.
```
@ -36,4 +36,4 @@ This is the manual of [Evennia](http://www.evennia.com), the open source Python
- [Links](./Links) - useful links
- [Table of Contents](./toc) - an alphabetical listing of all regular documentation pages
Want to help improve the docs? See the page on [Contributing to the docs](./Contributing-Docs)!
Want to help improve the docs? See the page on [Contributing to the docs](./Contributing-Docs)!