app/controllers/projects_controller.rb · 742e6eeed221489d5f35bdfde2e6ce55db75d25f · Kirill Smelkov / gitlab-ce · GitLab

You need to sign in or sign up before continuing.

Find file Blame History Permalink

Merge branch 'upstream-master' into markdown-preview · 742e6eee
Vinnie Okada authored Dec 07, 2014
```
Conflicts:
	spec/routing/project_routing_spec.rb
```
742e6eee