Daniel Hensby a0812f987a

Merge 3.1 into 3.2 ...

Conflicts:
	admin/javascript/LeftAndMain.js
	control/HTTPRequest.php
	docs/en/00_Getting_Started/00_Server_Requirements.md

2016-04-26 00:09:33 +01:00

..

manifest

Remove unused local vars

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

startup

Merge 3.1 into 3.2

2016-04-26 00:09:33 +01: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-11-03 11:10:46 +13:00

Config.php

Remove unused local vars

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

Constants.php

FIX undeclared constant issue

2016-02-27 21:00:45 +13:00

Convert.php

Url-safe alternative for base64_encode in resampled Image filenames

2015-08-05 20:59:40 +02:00

Core.php

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

2015-03-11 11:40:06 +13: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

Merge pull request #4475 from JeroenDeDauw/rm-unused-vars

2015-09-01 11:42:16 +12:00

PaginatedList.php

UPDATE: change all instances of $this->request to use appropriate getter/setter

2015-04-30 11:04:08 +12:00

TempPath.php

Remove unused local vars

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