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
..
2014-11-18 12:45:54 +13:00
2015-03-17 14:15:54 +13:00
2015-07-01 17:41:32 +12:00
2014-10-14 15:19:48 +13:00
2015-09-09 14:50:47 +12:00
2015-09-15 13:42:17 +12:00
2014-08-19 09:17:15 +12:00
2014-08-19 09:17:15 +12:00
2014-11-18 12:45:54 +13:00
2015-09-15 13:42:17 +12:00
2015-01-15 18:52:46 +13:00
2014-08-19 09:17:15 +12:00
2015-06-02 19:13:38 +12:00
2014-08-19 09:17:15 +12:00
2014-08-19 09:17:15 +12:00
2014-08-19 09:17:15 +12:00
2015-09-29 23:49:29 +02:00
2015-07-20 16:42:33 +01:00
2014-08-19 09:17:15 +12:00
2012-09-30 17:18:13 +13:00
2015-06-09 11:31:34 +12:00
2015-06-17 15:51:30 +12:00
2015-08-24 11:26:25 +12:00
2015-09-22 10:38:12 +12:00
2014-08-19 09:17:15 +12:00