Damian Mooyman
1e1a7a345c
Merge remote-tracking branch 'origin/3'
Conflicts:
control/Director.php
filesystem/File.php
filesystem/GD.php
filesystem/ImagickBackend.php
forms/HtmlEditorField.php
javascript/UploadField_uploadtemplate.js
model/Image.php
model/Image_Backend.php
model/fieldtypes/Enum.php
templates/AssetUploadField.ss
tests/model/ImageTest.php
tests/search/FulltextFilterTest.php
2015-11-03 14:23:16 +13:00
..
2015-07-22 14:17:03 +01:00
2015-10-06 12:54:35 +13:00
2015-11-03 14:23:16 +13:00
2015-10-23 16:57:44 +13:00
2015-11-03 14:23:16 +13:00
2012-04-13 15:32:05 +02:00
2014-12-04 15:41:10 +01:00
2015-09-24 12:57:28 +12:00
2015-09-24 12:57:28 +12:00
2012-03-09 12:54:02 +13:00
2015-10-23 17:39:42 +13:00
2015-07-22 14:17:03 +01:00
2013-07-14 20:43:52 +12:00
2013-07-14 20:43:52 +12:00
2012-04-15 10:50:19 +12:00
2013-07-14 20:43:52 +12:00
2012-02-03 01:00:08 +01:00
2015-10-06 15:03:49 -04:00