Skip to content

Commit

Permalink
Merge pull request #7524 from mbabker/3.5-Composer-Updates
Browse files Browse the repository at this point in the history
Composer update for Joomla Framework packages and PHPUnit
  • Loading branch information
wilsonge committed Jul 22, 2015
2 parents 3d80086 + af596f6 commit 5cc6725
Show file tree
Hide file tree
Showing 25 changed files with 469 additions and 326 deletions.
79 changes: 40 additions & 39 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions libraries/vendor/composer/autoload_classmap.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
$baseDir = dirname(dirname($vendorDir));

return array(
'CallbackFilterIterator' => $vendorDir . '/joomla/compat/src/CallbackFilterIterator.php',
'JsonSerializable' => $vendorDir . '/joomla/compat/src/JsonSerializable.php',
'PHPMailer' => $vendorDir . '/phpmailer/phpmailer/class.phpmailer.php',
'POP3' => $vendorDir . '/phpmailer/phpmailer/class.pop3.php',
Expand Down
Loading

0 comments on commit 5cc6725

Please sign in to comment.