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-15 12:52:03 -07:00
2015-03-14 18:09:54 +11:00
2015-01-11 20:56:17 -08:00
2015-03-06 18:53:04 +11:00
2015-03-07 11:14:03 +11:00
2015-03-12 20:50:16 +11:00
2015-03-12 20:50:16 +11:00
2015-03-06 20:41:14 +11:00
2015-03-12 20:50:16 +11:00
2015-03-12 20:50:16 +11:00
2014-11-12 07:33:58 +11:00
2015-03-06 18:54:45 +11:00
2014-11-27 17:21:30 +11:00
2015-01-11 20:56:17 -08:00
2015-03-06 17:31:54 +11:00
2015-03-06 17:31:54 +11:00
2014-09-29 16:26:21 +10:00
2014-10-27 17:59:53 +11:00
2015-01-29 20:04:47 +11:00
2015-03-12 20:50:16 +11:00
2014-09-29 17:13:05 +10:00
2015-03-07 23:36:25 +03:00
2015-03-12 20:50:16 +11:00