Merge master into api3/network

This commit is contained in:
Dylan K. Taylor
2017-04-10 21:21:29 +01:00
committed by GitHub
9 changed files with 141 additions and 32 deletions

View File

@ -128,7 +128,6 @@ namespace pocketmine {
set_time_limit(0); //Who set it to 30 seconds?!?!
gc_enable();
error_reporting(-1);
ini_set("allow_url_fopen", 1);
ini_set("display_errors", 1);