app/views/projects/_settings_nav.html.haml · 6373c84d5f8de2e8b7ac11f558f2810c506d443a · nexedi / gitlab-ce

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ee-7-4 · eafac593

Dmitriy Zaporozhets authored Oct 03, 2014

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/helpers/merge_requests_helper.rb
	doc/update/README.md
	lib/gitlab/reference_extractor.rb

eafac593

_settings_nav.html.haml 1.15 KB

Replace _settings_nav.html.haml