Ingo Schommer ab070944d5 Merge branch 'pulls/apidocs-package-list' of https://github.com/madmatt/silverstripe-framework into madmatt-pulls/apidocs-package-list ...

Conflicts:
	view/SSTemplateParser.php
	view/SSTemplateParser.php.inc

2014-01-31 15:15:59 +13:00

..

Email.php

Email fluent API regression (fixes #2581)

2013-10-22 20:31:29 +02:00

Mailer.php

Updating @package and @subpackage doc tags

2013-11-29 17:49:30 +13:00