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

Conflicts:
	app/assets/javascripts/merge_requests.js.coffee
	app/assets/stylesheets/sections/merge_requests.scss
	app/controllers/projects/merge_requests_controller.rb
2014-04-06 13:54:54 +03:00
..
images Move images from vendor to app so they are compiled by rails 2014-03-12 10:19:24 +02:00
javascripts Merge branch 'remove_source_branch_button' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-remove_source_branch_button 2014-04-06 13:54:54 +03:00
stylesheets Replace custom jquery css with native one. Fixes wrong assets path for calendar in production 2014-04-02 14:57:00 +03:00