Damian Mooyman 09210efbc0 Merge remote-tracking branch 'origin/3' ...

Conflicts:
	composer.json
	control/Session.php
	docs/en/05_Contributing/01_Code.md
	docs/en/05_Contributing/02_Release_Process.md
	forms/FormField.php
	model/DataQuery.php
	model/Image.php
	model/queries/SQLConditionalExpression.php
	view/SSViewer.php
	view/ViewableData.php

2015-07-31 15:49:35 +12:00

..

manifest

FIX Imported namespaces now correctly used to determine class inheritance

2015-06-20 16:09:10 +01:00

startup

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

2015-06-02 19:13:38 +12:00

ArrayLib.php

Remove all redundant whitespace

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

ClassInfo.php

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

2015-07-31 11:38:18 +12:00

Config.php

Merge branch '3.1' into 3.2

2015-07-20 10:48:01 +01:00

Constants.php

Merge remote-tracking branch 'origin/3'

2015-07-31 15:49:35 +12:00

Convert.php

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

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

Core.php

FIX: allow for increase_time_limit_to to work if $_increase_time_limit_max is not yet set

2015-06-22 08:17:04 +12: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

Remove all redundant whitespace

2014-08-19 09:17:15 +12: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

Mark Object caching methods as deprecated

2015-07-27 17:15:53 +01:00

PaginatedList.php

Merge remote-tracking branch 'origin/3'

2015-05-19 09:19:47 +12:00

TempPath.php

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

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