Merge branch 'master' into release

BookStackApp · Feb 1, 2016 · f784c03 · f784c03
2 parents 148e172 + 4bb7f06
commit f784c03
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
@@ -21,10 +21,10 @@ public function up()
             $table->timestamps();
         });
 
-        \BookStack\User::create([
+        \BookStack\User::forceCreate([
             'name' => 'Admin',
             'email' => '[email protected]',
-            'password' => \Illuminate\Support\Facades\Hash::make('password')
+            'password' => bcrypt('password')
         ]);
     }