mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity
winter/modules
History
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
..
backend
Merge branch 'develop' into media-manager
2015-03-15 13:06:50 -07:00
cms
Merge branch 'develop' into media-manager
2015-03-15 13:06:50 -07:00
system
Merge branch 'develop' into media-manager
2015-03-15 13:06:50 -07:00