alekseybobkov 78ad303236 Merge branch 'develop' into media-manager
Conflicts:
	composer.json
	modules/backend/assets/css/october.css
	modules/backend/assets/less/controls/lists.less
	modules/backend/assets/less/october.less
	modules/backend/widgets/Form.php
	modules/backend/widgets/form/partials/_field.htm
2015-03-15 13:06:50 -07:00
..
2015-03-03 14:34:38 +11:00
2015-02-11 20:46:06 +11:00
2015-03-12 13:37:12 +07:00
2015-03-14 15:07:57 +11:00
2015-03-12 20:50:16 +11:00
2015-01-28 11:49:54 +11:00
2015-02-12 21:04:05 +11:00
2015-02-23 17:52:43 +11:00
2015-01-03 12:41:23 +01:00