Files
gitlabhq/features/steps/group
Dmitriy Zaporozhets b03b69e23e Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-1
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/images/brand_logo.png
	app/assets/stylesheets/sections/login.scss
	app/controllers/projects/merge_requests_controller.rb
	app/helpers/appearances_helper.rb
	app/views/layouts/devise.html.haml
2014-07-16 12:39:45 +03:00
..