fixing conflicts.

2012-04-04 10:09:27 -05:00
parent 9f80351916 7f9e38a770
commit a85945561c
66 changed files with 2367 additions and 267 deletions
--- a/laravel/laravel.php
+++ b/laravel/laravel.php
@@ -195,4 +195,4 @@ $response->send();
 |
 */

-Event::fire('laravel.done');
+Event::fire('laravel.done', array($response));