Franz Liedke 1cbc60ca41 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

..

2015_02_24_000000_create_access_tokens_table.php

Refer to Schema facade by full namespace

2015-06-09 02:45:02 +02:00

2015_02_24_000000_create_activity_table.php

Refer to Schema facade by full namespace

2015-06-09 02:45:02 +02:00

2015_02_24_000000_create_config_table.php

Refer to Schema facade by full namespace

2015-06-09 02:45:02 +02:00

2015_02_24_000000_create_discussions_table.php

Refer to Schema facade by full namespace

2015-06-09 02:45:02 +02:00

2015_02_24_000000_create_email_tokens_table.php

Refer to Schema facade by full namespace

2015-06-09 02:45:02 +02:00

2015_02_24_000000_create_groups_table.php

Refer to Schema facade by full namespace

2015-06-09 02:45:02 +02:00

2015_02_24_000000_create_notifications_table.php

Refer to Schema facade by full namespace

2015-06-09 02:45:02 +02:00

2015_02_24_000000_create_password_tokens_table.php

Refer to Schema facade by full namespace

2015-06-09 02:45:02 +02:00

2015_02_24_000000_create_permissions_table.php

Refer to Schema facade by full namespace

2015-06-09 02:45:02 +02:00

2015_02_24_000000_create_posts_table.php

Refer to Schema facade by full namespace

2015-06-09 02:45:02 +02:00

2015_02_24_000000_create_users_discussions_table.php

Merge branch 'master' into psr-7

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

2015_02_24_000000_create_users_groups_table.php

Refer to Schema facade by full namespace

2015-06-09 02:45:02 +02:00

2015_02_24_000000_create_users_table.php

Merge branch 'master' into psr-7

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