features/project/project.feature · e64343d6e190e5a6acd7d94b79add8d8ffaa7f15 · nexedi / gitlab-ce

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-changes · e64343d6

Dmitriy Zaporozhets authored Jun 26, 2014

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

Conflicts:
	VERSION
	app/views/layouts/devise.html.haml
	features/project/project.feature
	features/steps/project/project.rb

e64343d6

project.feature 1.2 KB

Replace project.feature