Daniel Hensby 745faebd81 Merge 3.2 into 3.3 ... Conflicts: .travis.yml		2016-04-26 00:17:09 +01:00
..
File.php	Merge 3.2 into 3.3	2016-04-26 00:17:09 +01: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	FIX file sync removes folders with dot in name	2016-03-07 12:27:18 -08:00
GD.php	BUG fix imagick interface and add to travis	2015-10-06 12:40:24 +13:00
ImagickBackend.php	BUG fix imagick interface and add to travis	2015-10-06 12:40:24 +13:00
Upload.php	Merge remote-tracking branch 'origin/3.1' into 3	2015-06-17 11:24:25 +12:00