db · 0d715bcd812ca6c99884e117f28a400669aa8e57 · Forest Godfrey / gitlab-ce · GitLab

BigW Consortium Gitlab

History Find file

Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork · 0d715bcd
Dmitriy Zaporozhets authored Jul 30, 2013
```
Conflicts:
	app/views/projects/commit/show.html.haml
	app/views/projects/compare/show.html.haml
	app/views/projects/merge_requests/branch_from.js.haml
```
0d715bcd

Name	Last commit	Last update
..
fixtures		Loading commit data...
migrate		Loading commit data...
schema.rb		Loading commit data...
seeds.rb		Loading commit data...