Merge branch '5.3'

GrahamCampbell · GrahamCampbell · commit 9e51e89fa2fc · 2016-12-27T14:53:21.000Z
diff --git a/src/Illuminate/Cache/MemcachedStore.php b/src/Illuminate/Cache/MemcachedStore.php
@@ -194,7 +194,7 @@ public function flush()
     /**
      * Get the UNIX timestamp for the given number of minutes.
      *
-     * @parma  int  $minutes
+     * @param  int  $minutes
      * @return int
      */
     protected function toTimestamp($minutes)

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ public function flush()`
`194`	`194`	`/**`
`195`	`195`	`* Get the UNIX timestamp for the given number of minutes.`
`196`	`196`	`*`
`197`		`- * @parma int $minutes`
	`197`	`+ * @param int $minutes`
`198`	`198`	`* @return int`
`199`	`199`	`*/`
`200`	`200`	`protected function toTimestamp($minutes)`