rosa-build/app/assets
Alexander Machehin a4c8e8eff8 Merge branch 'master' into 616-issues_and_comments
Conflicts:
	Gemfile
	app/assets/stylesheets/design/custom.scss
	app/controllers/projects/projects_controller.rb
2012-09-17 16:52:50 +06:00
..
images Merge branch 'master' into 590-build_list_page_change 2012-08-14 15:46:16 +04:00
javascripts Merge branch 'master' into 616-issues_and_comments 2012-09-17 16:52:50 +06:00
stylesheets Merge branch 'master' into 616-issues_and_comments 2012-09-17 16:52:50 +06:00