Damian Mooyman b552a7370f Merge remote-tracking branch 'origin/3' ...

Conflicts:
	tests/model/ImageTest.php

2015-09-09 15:44:47 +12:00

..

File.php

Merge remote-tracking branch 'origin/3'

2015-09-09 15:44:47 +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

Save resampled images into a folder structure indicating transformations

2015-09-01 00:40:27 +02:00

Folder.php

API make DataObject::validate public

2015-06-17 15:51:30 +12:00

GD.php

Revert #3425 #3396 to restore deprecated functionality

2015-08-24 11:26:25 +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