Files
gitlabhq/spec/requests
Dmitriy Zaporozhets 67d6a79ee9 Merge branch 'ce-ee-master' into ee-master
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	config/initializers/1_settings.rb
	config/initializers/7_omniauth.rb
2014-10-22 14:47:04 +03:00
..