Damian Mooyman 43f49e8434 Merge remote-tracking branch 'origin/3.1' into 3 ...

Conflicts:
	admin/code/ModelAdmin.php
	control/Director.php
	model/SQLQuery.php
	security/Member.php
	tests/control/HTTPTest.php
	tests/model/SQLQueryTest.php
	tests/security/SecurityTest.php
	tests/view/SSViewerTest.php

2015-03-31 19:54:15 +13:00

..

manifest

Remove all redundant whitespace

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

startup

BUG ErrorControlChain now supports exception handling

2014-09-26 16:54:34 +12:00

ArrayDataTest.php

Remove all redundant whitespace

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

ArrayLibTest.php

Remove all redundant whitespace

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

ClassInfoTest.php

Cleaning up Test DataObjects to ensure TestOnly is implemented

2015-02-12 15:22:29 +00:00

ConfigTest.php

Change the LRU cache to a simple in-memory model

2015-03-09 02:01:24 +00:00

ConvertTest.php

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

2015-03-31 19:54:15 +13:00

CoreTest.php

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

2015-02-20 10:17:19 +13:00

DiffTest.php

Remove all redundant whitespace

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

HTMLCleanerTest.php

Remove all redundant whitespace

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

ObjectTest.php

Merge remote-tracking branch 'origin/3.1'

2014-11-18 12:45:54 +13:00