Merge commit '99ca8493'

* commit '99ca8493': Squashed 'Modules/User/' changes from 9ef6f40..95673b5

Merge commit '99ca8493'
* commit '99ca8493': Squashed 'Modules/User/' changes from 9ef6f40..95673b5
0595b6e4 · Nicolas Widart · 889d9ba1 · 99ca8493 · 0595b6e4
Commit 0595b6e4 authored Nov 01, 2014 by Nicolas Widart
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

RolesController.php Modules/User/Http/Controllers/Admin/RolesController.php +1 -1

No files found.
--- a/Modules/User/Http/Controllers/Admin/RolesController.php
+++ b/Modules/User/Http/Controllers/Admin/RolesController.php
@@ -63,7 +63,7 @@ class RolesController extends BaseUserModuleController
    /**
     * Show the form for editing the specified resource.
     *
-     * @param  int $id
+     * @param int $id
     * @return Response
     */
    public function edit($id)