Stefan Talen 61cf1ad710 Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 ...

Conflicts:
	modules/backend/behaviors/FormController.php
	modules/backend/classes/AuthManager.php
	modules/backend/lang/fa/lang.php
	modules/backend/widgets/Form.php
	modules/cms/classes/CmsCompoundObject.php
	modules/cms/classes/ComponentHelpers.php
	modules/cms/formwidgets/Components.php

2014-10-11 11:58:20 +02:00

..

assets

Improve translation handling

2014-10-11 10:37:48 +11:00

behaviors

Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2

2014-10-11 11:58:20 +02:00

classes

Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2

2014-10-11 11:58:20 +02:00

controllers

Updating backend/controllers

2014-10-10 23:26:57 +02:00

database

Updating backend/database

2014-10-10 23:34:34 +02:00

facades

Updating backend/facades

2014-10-10 23:36:04 +02:00

formwidgets

Updating modules/backend/formwidgets

2014-10-10 23:50:05 +02:00

lang

Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2

2014-10-11 11:58:20 +02:00

layouts

…

models

Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2

2014-10-11 11:58:20 +02:00

skins

Updating modules/backend/skins

2014-10-11 00:05:35 +02:00

traits

Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2

2014-10-11 11:58:20 +02:00

views

…

widgets

Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2

2014-10-11 11:58:20 +02:00

composer.json

…

routes.php

Updating single files in backend

2014-10-10 23:16:22 +02:00

ServiceProvider.php

Updating single files in backend

2014-10-10 23:16:22 +02:00