app/views/profiles/preferences · 3e99123095b26988de67a94b0e7a5207c1ef5ae2 · Forest Godfrey / gitlab-ce · GitLab

BigW Consortium Gitlab

History Find file

Fix merge conflicts - squashed commit · 3e991230
James Lopez authored Jun 03, 2016
```
# Conflicts:
#	app/models/project.rb
```
3e991230

Name	Last commit	Last update
..
show.html.haml		Loading commit data...
update.js.erb		Loading commit data...