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

..

admin

Remove obsolete include

2015-06-08 10:00:13 +02:00

forum

Increase text contrast

2015-06-11 18:42:05 +09:30

lib

Increase text contrast

2015-06-11 18:42:05 +09:30