alekseybobkov 219f1ff8f7 Merge branch 'develop' into static-pages-support ... Conflicts: modules/backend/assets/less/controls/filelist.less		2014-10-16 21:03:20 -07:00
..
controls	Merge branch 'develop' into static-pages-support	2014-10-16 21:03:20 -07:00
core	BackendSettings -> BrandSettings	2014-10-15 19:53:44 +11:00
layout	BackendSettings -> BrandSettings	2014-10-15 19:53:44 +11:00
.gitignore	Welcome to the world, October :-)	2014-05-14 23:24:20 +10:00
october.less	Merge branch 'develop' of github.com:octobercms/october into develop	2014-08-14 16:51:49 +11:00