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

# Conflicts:
#	admin/css/ie8.css.map
#	admin/css/screen.css
#	admin/css/screen.css.map
#	admin/scss/_style.scss
#	css/AssetUploadField.css
#	css/GridField.css.map
#	docs/en/02_Developer_Guides/00_Model/08_SQL_Select.md
#	lang/fi.yml

2016-01-25 16:15:41 +13:00

..

manifest

Merge remote-tracking branch 'origin/3'

2016-01-20 13:16:27 +13:00

startup

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

ArrayLib.php

Do not hang on nested parameters in search context

2015-09-23 09:12:02 +02:00

ClassInfo.php

Merge remote-tracking branch 'origin/3.1' into 3.2

2015-11-03 11:10:46 +13:00

Config.php

Remove unused local vars

2015-08-03 20:42:43 +02:00

Constants.php

Merge remote-tracking branch 'origin/3'

2016-01-20 13:16:27 +13:00

Convert.php

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

Core.php

NEW Update SS_ConfigStaticManifest to use Reflection

2015-09-03 22:25:42 +00:00

DAG.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

Diff.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

Extension.php

API Asset Access Control implementation

2016-01-13 18:18:22 +13:00

Flushable.php

NEW Provide a consistent way of triggering flush

2014-08-22 09:24:27 +12:00

HTMLCleaner.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

Object.php

Merge remote-tracking branch 'origin/3'

2016-01-25 16:15:41 +13:00

PaginatedList.php

Merge remote-tracking branch 'origin/3'

2015-11-03 14:23:16 +13:00

TempPath.php

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00