Merge remote-tracking branch 'origin/develop' into develop

2017-04-11 18:35:13 -05:00 · 2017-04-11 18:35:13 -05:00 · 61042a223a
commit 61042a223a
parent a536402228 15f8e2d45e
1 changed files with 1 additions and 1 deletions
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@ -14,7 +14,7 @@ use Faker\Generator as Faker;
 |
 */

-/** @var \Illuminate\Database\Eloquent\Factory $factory */
+/* @var \Illuminate\Database\Eloquent\Factory $factory */
 $factory->define(User::class, function (Faker $faker) {
    static $password;