config/routes.rb · 48eccdb2fcfa28c2ab602b76b97ff064195bb113 · Forest Godfrey / gitlab-ce · GitLab

BigW Consortium Gitlab

Blame History Permalink

Merge branch 'master' into merge-if-green · eab086bd
Douwe Maan authored Dec 09, 2015
```
# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	config/routes.rb
```
eab086bd

routes.rb 18.5 KB