Alexander Machehin 071c391a6e Merge branch '3.2-master' into 270-user_control ... Conflicts: app/assets/stylesheets/design/custom.scss		2012-03-22 21:15:10 +06:00
..
common.scss	Remove compass-bootstrap. Take back DJ fix. Refs #263	2012-03-03 02:42:10 +02:00
custom.scss	Merge branch '3.2-master' into 270-user_control	2012-03-22 21:15:10 +06:00
git.scss	Fix build_lists bugs. Add build list display and new build list pages design, apply compass. Refactor and cleanup assets. Refactor abilities. Refactor build_list search. Improve layout_class helper. Change defaul build_lists index filter and fix specs. Fix assets path. Refs #223	2012-03-02 02:04:04 +02:00
main.scss	[refs #325] Fixes descripton styles for project page into main css	2012-03-22 16:31:39 +04:00