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

This commit is contained in:
Manish Verma
2016-11-04 18:23:31 +05:30
parent e4b9755294
commit 775e0561d8
2541 changed files with 59048 additions and 90348 deletions

View File

@@ -21,7 +21,6 @@ return array(
'Net' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'),
'Namshi\\JOSE' => array($vendorDir . '/namshi/jose/src'),
'Mremi\\UrlShortener' => array($vendorDir . '/mremi/url-shortener/src'),
'MaxMind' => array($vendorDir . '/maxmind-db/reader/src'),
'Math' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'),
'Maatwebsite\\Excel\\' => array($vendorDir . '/maatwebsite/excel/src'),
'JakubOnderka\\PhpConsoleHighlighter' => array($vendorDir . '/jakub-onderka/php-console-highlighter/src'),