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

Merge branch 'master' into psr-7

Browse Source 
Conflicts:
	src/Api/Actions/Discussions/IndexAction.php
	src/Api/Actions/SerializeAction.php
	src/Core/Formatter/FormatterManager.php
	src/Extend/ForumAssets.php
	src/Forum/Actions/IndexAction.php
	src/Forum/ForumServiceProvider.php
This commit is contained in:
Franz Liedke
2015-06-17 00:52:50 +02:00
parent ffb28838b5 d1e7453ffd
commit 1cbc60ca41
91 changed files with 1381 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Forum/ForumServiceProvider.php
View File

@@ -1,9 +1,10 @@
<?php namespace Flarum\Forum;
use Flarum\Extend\ForumTranslations;
use Flarum\Http\RouteCollection;
use Flarum\Http\UrlGenerator;
use Flarum\Support\AssetManager;
use Illuminate\Support\ServiceProvider;
use Flarum\Support\ServiceProvider;
use Psr\Http\Message\ServerRequestInterface;
class ForumServiceProvider extends ServiceProvider
@@ -43,6 +44,12 @@ class ForumServiceProvider extends ServiceProvider
]);
$this->routes();
$this->extend(
new ForumTranslations([
//
])
);
}
protected function routes()