Merge branch 'master' into management

This commit is contained in:
Tulir Asokan 2018-11-02 01:25:14 +02:00
commit fd64b7b9b1

View File

@ -14,6 +14,7 @@ Matrix room: [#maubot:maunium.net](https://matrix.to/#/#maubot:maunium.net)
* [media](https://github.com/maubot/media) - A bot that replies with the MXC URI of images you send it. * [media](https://github.com/maubot/media) - A bot that replies with the MXC URI of images you send it.
* [dice](https://github.com/maubot/dice) - A combined dice rolling and calculator bot. * [dice](https://github.com/maubot/dice) - A combined dice rolling and calculator bot.
* [karma](https://github.com/maubot/karma) - A user karma tracker bot. * [karma](https://github.com/maubot/karma) - A user karma tracker bot.
* [xkcd](https://github.com/maubot/xkcd) - A bot to view xkcd comics.
* [echo](https://github.com/maubot/echo) - A bot that echoes pings and other stuff. * [echo](https://github.com/maubot/echo) - A bot that echoes pings and other stuff.
### Upcoming ### Upcoming