Merge pull request #619 from ArthurHoaro/plugins/param-desc

author VirtualTam <virtualtam@flibidi.net>

Sat, 13 Aug 2016 12:48:51 +0000 (14:48 +0200)

committer GitHub <noreply@github.com>

Sat, 13 Aug 2016 12:48:51 +0000 (14:48 +0200)
author VirtualTam <virtualtam@flibidi.net>
Sat, 13 Aug 2016 12:48:51 +0000 (14:48 +0200)
committer GitHub <noreply@github.com>
Sat, 13 Aug 2016 12:48:51 +0000 (14:48 +0200)
diff --cc application/PluginManager.php
Simple merge
diff --cc tests/PluginManagerTest.php
Simple merge
author	VirtualTam <virtualtam@flibidi.net>
	Sat, 13 Aug 2016 12:48:51 +0000 (14:48 +0200)
committer	GitHub <noreply@github.com>
	Sat, 13 Aug 2016 12:48:51 +0000 (14:48 +0200)
		1	2
application/PluginManager.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/PluginManagerTest.php	patch \|	diff1 \|	diff2 \|	blob \| history