Merge branch '4.0'

taylorotwell · taylorotwell · commit 2dab1e526c39 · 2013-09-12T21:51:34.000-05:00
diff --git a/src/Illuminate/Database/Eloquent/Model.php b/src/Illuminate/Database/Eloquent/Model.php
@@ -1420,11 +1420,11 @@ public function getQualifiedDeletedAtColumn()
 	/**
 	 * Get a fresh timestamp for the model.
 	 *
-	 * @return DateTime
+	 * @return Carbon
 	 */
 	public function freshTimestamp()
 	{
-		return new DateTime;
+		return new Carbon;
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -1420,11 +1420,11 @@ public function getQualifiedDeletedAtColumn()`
`1420`	`1420`	`/**`
`1421`	`1421`	`* Get a fresh timestamp for the model.`
`1422`	`1422`	`*`
`1423`		`- * @return DateTime`
	`1423`	`+ * @return Carbon`
`1424`	`1424`	`*/`
`1425`	`1425`	`public function freshTimestamp()`
`1426`	`1426`	`{`
`1427`		`- return new DateTime;`
	`1427`	`+ return new Carbon;`
`1428`	`1428`	`}`
`1429`	`1429`
`1430`	`1430`	`/**`