silverstripe-framework/filesystem
Damian Mooyman 09210efbc0 Merge remote-tracking branch 'origin/3'
Conflicts:
	composer.json
	control/Session.php
	docs/en/05_Contributing/01_Code.md
	docs/en/05_Contributing/02_Release_Process.md
	forms/FormField.php
	model/DataQuery.php
	model/Image.php
	model/queries/SQLConditionalExpression.php
	view/SSViewer.php
	view/ViewableData.php
2015-07-31 15:49:35 +12:00
..
File.php Merge remote-tracking branch 'origin/3' 2015-07-31 15:49:35 +12:00
FileFinder.php API Marked statics private, use Config API instead (#8317) 2013-03-24 17:20:53 +01:00
FileNameFilter.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Filesystem.php API New Database abstraction layer. Ticket #7429 2014-07-09 18:04:05 +12:00
Folder.php API make DataObject::validate public 2015-06-17 15:51:30 +12:00
GD.php Merge remote-tracking branch 'origin/3' 2015-07-31 15:49:35 +12:00
ImagickBackend.php Merge remote-tracking branch 'origin/3' 2015-07-31 15:49:35 +12:00
Upload.php Merge remote-tracking branch 'origin/3' 2015-06-17 15:41:13 +12:00