Merge remote-tracking branch 'refs/remotes/origin/master' into arindam-bug-priority

2016-11-04 18:23:31 +05:30
parent e4b9755294
commit 775e0561d8
2541 changed files with 59048 additions and 90348 deletions
--- a/vendor/psr/log/Psr/Log/NullLogger.php
+++ b/vendor/psr/log/Psr/Log/NullLogger.php
@@ -19,7 +19,7 @@ class NullLogger extends AbstractLogger
     * @param string $message
     * @param array  $context
     *
-     * @return null
+     * @return void
     */
    public function log($level, $message, array $context = array())
    {