mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-30 13:10:24 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into psr-7

Browse Source 
Conflicts:
	composer.json
	composer.lock
	src/Api/Actions/TokenAction.php
	src/Core/Formatter/FormatterManager.php
	src/Core/Handlers/Events/EmailConfirmationMailer.php
	src/Forum/Actions/ConfirmEmailAction.php
	src/Forum/Actions/IndexAction.php
	src/Forum/Actions/ResetPasswordAction.php
	src/Forum/Actions/SavePasswordAction.php
	src/Forum/routes.php
This commit is contained in:
Franz Liedke
2015-06-06 13:59:59 +02:00
parent 9564778701 381e7a2c57
commit c2df8d5214
115 changed files with 2286 additions and 1619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Console/SeedCommand.php
View File

@@ -28,8 +28,8 @@ class SeedCommand extends Command
*/
public function fire()
{
$this->call('db:seed', ['--class' => 'Flarum\Core\Seeders\DiscussionsTableSeeder']);
$this->call('db:seed', ['--class' => 'Flarum\Core\Seeders\UsersTableSeeder']);
$this->call('db:seed', ['--class' => 'Flarum\Core\Seeders\DiscussionsTableSeeder']);
}
/**