Samuel Georges 1db67af8e8 Merge remote-tracking branch 'remotes/origin/develop' into l55upgrade ...

Conflicts:
	modules/system/lang/en/lang.php

2017-07-11 10:48:54 +10:00

..

assets

Merge remote-tracking branch 'remotes/origin/develop' into l55upgrade

2017-07-11 10:48:54 +10:00

behaviors

Merge remote-tracking branch 'remotes/origin/develop' into l55upgrade

2017-07-11 10:48:54 +10:00

classes

Merge remote-tracking branch 'remotes/origin/develop' into l55upgrade

2017-07-11 10:48:54 +10:00

controllers

Merge remote-tracking branch 'remotes/origin/develop' into l55upgrade

2017-07-11 10:48:54 +10:00

database

Code dusting (#2826)

2017-04-24 21:38:19 +10:00

facades

Code dusting (#2826)

2017-04-24 21:38:19 +10:00

formwidgets

Merge remote-tracking branch 'remotes/origin/develop' into l55upgrade

2017-07-11 10:48:54 +10:00

helpers

…

lang

Support changing the global default for richeditor buttons (#2937)

2017-07-04 08:10:58 -06:00

layouts

URL -> Url

2017-06-02 23:34:50 +10:00

models

Merge remote-tracking branch 'remotes/origin/develop' into l55upgrade

2017-07-11 10:48:54 +10:00

reportwidgets

…

skins

…

traits

Create an error making trait

2017-06-11 22:38:03 +10:00

views

URL -> Url

2017-06-02 23:34:50 +10:00

widgets

Merge remote-tracking branch 'remotes/origin/develop' into l55upgrade

2017-07-11 10:48:54 +10:00

composer.json

Change versions for testing

2017-05-19 14:13:23 +10:00

routes.php

Apply web middleware group for the good cookies

2017-05-13 22:18:13 +10:00

ServiceProvider.php

String to ::class

2017-06-03 10:31:24 +10:00