fixing conflicts.

2012-05-11 08:49:17 -05:00
parent ef6076b2ce 94f49c3627
commit 314f25bd28
3 changed files with 11 additions and 3 deletions
--- a/laravel/documentation/changes.md
+++ b/laravel/documentation/changes.md
@@ -74,6 +74,7 @@
 - Added true reflection based IoC to container.
 - Added `Request::route()->controller` and `Request::route()->controller_action`.
 - Added `Event::queue`, `Event::flusher`, and `Event::flush` methods to Event class.
+- Added `array_except` and `array_only` helpers, similar to `Input::except` and `Input::only` but for arbitrary arrays.

 <a name="upgrade-3.2"></a>
 ## Upgrading From 3.1