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

BigW Consortium Gitlab

Dec 09, 2015
eab086bd
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
Merge branch 'master' into merge-if-green
Douwe Maan authored Dec 09, 2015
```
# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	config/routes.rb
```