diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2015-02-22 07:55:30 -0700 |
|---|---|---|
| committer | Vinnie Okada <vokada@mrvinn.com> | 2015-02-22 07:55:30 -0700 |
| commit | 5a8d8b6f20ab795fddcf651a7298f61696c7e2ab (patch) | |
| tree | efad20db1967808cb278f903cda3f6d87d933d87 /spec | |
| parent | 64a7ecc9267f6f82d34b9e87a0271216c94cbbfd (diff) | |
| parent | 44dbbb76fc134826b80fa10aac60bf8c79ba01e7 (diff) | |
| download | gitlab-ce-5a8d8b6f20ab795fddcf651a7298f61696c7e2ab.tar.gz | |
Merge branch 'master' into rails-4.1.9
Conflicts:
app/views/dashboard/projects.html.haml
Diffstat (limited to 'spec')
0 files changed, 0 insertions, 0 deletions