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-02-07 10:08:10 +11:00
2015-03-03 14:34:38 +11:00
2015-02-23 19:55:41 +11:00
2015-03-14 11:31:49 +11:00
2015-02-07 21:07:08 +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-06 20:50:10 +11:00
2014-11-10 20:34:42 +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-05 19:47:20 +11:00
2014-09-19 17:23:11 +10:00
2015-02-23 17:52:43 +11:00
2015-01-03 12:41:23 +01:00
2015-03-03 18:40:20 +11:00