James Cole 8e1dbc03d9 Merge branch 'hotfix/3.7.2.2' into develop ...

Conflicts:
	app/Http/Controllers/RuleGroupController.php

2016-02-05 13:23:00 +01:00

..

app.php

Removed executable rights.

2016-01-28 21:22:26 +01:00

auth.php

Removed executable rights.

2016-01-28 21:22:26 +01:00

broadcasting.php

Removed executable rights.

2016-01-28 21:22:26 +01:00

cache.php

Removed executable rights.

2016-01-28 21:22:26 +01:00

compile.php

Removed executable rights.

2016-01-28 21:22:26 +01:00

csv.php

Moved parsing of amount with decimal separator to Converter object

2016-01-17 15:37:49 +01:00

database.php

Removed executable rights.

2016-01-28 21:22:26 +01:00

entrust.php

Code cleanup [skip ci]

2015-06-27 08:06:24 +02:00

filesystems.php

Removed executable rights.

2016-01-28 21:22:26 +01:00

firefly.php

Merge branch 'hotfix/3.7.2.2' into develop

2016-02-05 13:23:00 +01:00

mail.php

Removed executable rights.

2016-01-28 21:22:26 +01:00

queue.php

Removed executable rights.

2016-01-28 21:22:26 +01:00

services.php

Removed executable rights.

2016-01-28 21:22:26 +01:00

session.php

Removed executable rights.

2016-01-28 21:22:26 +01:00

twigbridge.php

String is a reserved class name in php7 changed to Str according to the upstream project

2016-01-03 15:52:12 +01:00

upgrade.php

Fix #171

2016-02-05 13:21:56 +01:00

view.php

Removed executable rights.

2016-01-28 21:22:26 +01:00