Samuel Georges d76863a3ec Merge branch 'develop' into stable ...

Conflicts:
	composer.json

2016-02-27 14:55:52 +11:00

..

cms/reference

Added .stub extension as namespaces.php is not a valid php file

2015-11-04 20:41:53 +01:00

plugins

Merge branch 'develop' into stable

2016-02-27 14:55:52 +11:00

themes

Write tests that verify the truth of #1373

2015-08-15 13:39:44 +10:00