Merge changes from master

This commit is contained in:
Dylan K. Taylor 2017-04-25 12:32:10 +01:00
commit 946d7e2bb1
2 changed files with 2 additions and 2 deletions

View File

@ -13,7 +13,7 @@ If you don't find what you're looking for there, [talk to a human](#discussion).
- [#pmmp + #pocketmine channel IRC](http://webchat.freenode.net/?channels=pmmp,pocketmine)
### Plugins
There are a very wide range of already-written plugins available which you can use to customise your server. Check out the [old plugin repository](http://plugins.pocketmine.net/), [Poggit](https://poggit.pmmp.io) or just search GitHub.
There are a very wide range of already-written plugins available which you can use to customise your server. Check out [the old plugin repository](http://plugins.pocketmine.net/) and [Poggit](https://poggit.pmmp.io), or just search GitHub.
### For developers
* [Latest API documentation](https://jenkins.pmmp.io/job/PocketMine-MP-doc/doxygen/) - Doxygen documentation generated from development

@ -1 +1 @@
Subproject commit dc4e7c35f287419e3af2352db3f9ed80bddb7bcd
Subproject commit ee5ebc25b4df6fefd84cfbfc2e26273794f9482b