fixing merge issues

2012-07-27 13:52:15 +01:00
parent da35e257fd b325e954e3
commit 2c6ed23b45
48 changed files with 101 additions and 101 deletions
--- a/laravel/cookie.php
+++ b/laravel/cookie.php
@@ -3,7 +3,7 @@
 class Cookie {

 	/**
-	 * How long is forever (in minutes).
+	 * How long is forever (in minutes)?
 	 *
 	 * @var int
 	 */