app/controllers/projects_controller.rb · 5f7a3e1bbdcb6044e4b25d0a7722b10f9140bb46 · nexedi / gitlab-ce · GitLab

Find file Blame History Permalink

Merge branch 'master' into extend_markdown_upload · 5f7a3e1b
Douwe Maan authored Feb 25, 2015
```
# Conflicts:
#	app/controllers/files_controller.rb
```
5f7a3e1b