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

..

ActivityType.php

Typehint container contract instead of application class.

2015-06-03 03:05:10 +02:00

AdminTranslations.php

Lay the groundwork for translation & refactor asset compilation

2015-06-10 14:23:56 +09:30

ApiInclude.php

Typehint container contract instead of application class.

2015-06-03 03:05:10 +02:00

ApiLink.php

Add API to add a link to an action

2015-06-16 17:39:47 +09:30

DiscussionGambit.php

Typehint container contract instead of application class.

2015-06-03 03:05:10 +02:00

EventSubscribers.php

Typehint container contract instead of application class.

2015-06-03 03:05:10 +02:00

ExtenderInterface.php

Typehint container contract instead of application class.

2015-06-03 03:05:10 +02:00

Formatter.php

Typehint container contract instead of application class.

2015-06-03 03:05:10 +02:00

ForumAssets.php

Merge branch 'master' into psr-7

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

ForumTranslations.php

Merge branch 'master' into psr-7

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

Locale.php

Merge branch 'master' into psr-7

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

NotificationType.php

Typehint container contract instead of application class.

2015-06-03 03:05:10 +02:00

Permission.php

Typehint container contract instead of application class.

2015-06-03 03:05:10 +02:00

PostType.php

Typehint container contract instead of application class.

2015-06-03 03:05:10 +02:00

Relationship.php

Merge branch 'master' into psr-7

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

SerializeAttributes.php

Typehint container contract instead of application class.

2015-06-03 03:05:10 +02:00

SerializeRelationship.php

Typehint container contract instead of application class.

2015-06-03 03:05:10 +02:00