Files
gitlabhq/doc/development
Marin Jankovski 3e875b05b4 Merge remote-tracking branch 'ce/master' into merge_ce
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/project_new.js.coffee
	app/controllers/projects_controller.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/project_team.rb
	app/models/user.rb
	app/services/files/create_service.rb
	app/views/layouts/nav/_admin.html.haml
	config/routes.rb
	db/schema.rb
	spec/models/jira_service_spec.rb
	spec/requests/api/projects_spec.rb
2015-01-29 11:34:43 -08:00
..
2014-11-27 10:24:19 +01:00
2014-08-25 11:53:09 +02:00

Development