features/admin/settings.feature · 38405495660ec1799c8069346f0292200eab273f · nexedi / gitlab-ce

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · 38405495

Dmitriy Zaporozhets authored Mar 25, 2015

Conflicts:
	app/assets/javascripts/dispatcher.js.coffee
	features/admin/settings.feature
	features/steps/admin/settings.rb
	features/steps/user.rb
	features/user.feature
	lib/gitlab/git_access.rb

38405495

settings.feature 715 Bytes

Replace settings.feature