Franz Liedke 0262f45f57 Merge branch 'master' into psr-7 ...

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

2015-06-17 00:52:50 +02:00

framework/core

Merge branch 'master' into psr-7

2015-06-17 00:52:50 +02:00

Description

Simple forum software for building great communities.

communityflarumforumhacktoberfestjavascriptlaravelphp

199 MiB

Languages

PHP 60.7%

TypeScript 26%

JavaScript 7.9%

Less 4.4%

Blade 0.8%

Other 0.2%