Merge commit 'd3021c628134293c2b8af505806efc2fba4fe947'

# Conflicts:
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor
2020-01-31 20:03:27 +00:00
2 changed files with 3 additions and 2 deletions

View File

@@ -139,7 +139,7 @@ class MainLogger extends \AttachableThreadedLogger{
}
/**
* @param array|null $trace
* @param mixed[][]|null $trace
*
* @return void
*/