Files
gitlabhq/app/workers
Dmitriy Zaporozhets 8dcffdcdc1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb
	app/models/service.rb
	app/views/devise/shared/_signin_box.html.haml
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/github.md
	features/project/service.feature
	lib/gitlab/github_import/client.rb
2015-03-02 16:10:12 -08:00
..
2015-03-01 20:51:03 +01:00
2014-12-05 11:06:16 +01:00
2013-01-09 08:14:05 +03:00