gitlab-org--gitlab-foss/app/assets
Dmitriy Zaporozhets 2a7da96a0d
Merge branch 'toggle_diff_comments' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-toggle_diff_comments
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/stylesheets/sections/commits.scss
	app/assets/stylesheets/sections/notes.scss
	app/views/projects/commits/_diffs.html.haml
	features/steps/project/merge_requests.rb
2014-03-13 23:11:16 +02:00
..
images Move images from vendor to app so they are compiled by rails 2014-03-12 10:19:24 +02:00
javascripts Refactor js behaviours helpers 2014-03-11 15:15:08 +02:00
stylesheets Merge branch 'toggle_diff_comments' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-toggle_diff_comments 2014-03-13 23:11:16 +02:00