diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2015-02-21 12:55:28 -0700 |
|---|---|---|
| committer | Vinnie Okada <vokada@mrvinn.com> | 2015-02-21 12:55:28 -0700 |
| commit | 2a9eed6620fd57c2a82edf5eab95dade3da250d3 (patch) | |
| tree | d4c33eaaae008510086b0476db9bd4ae32dc298e /lib/api/files.rb | |
| parent | 83e2a1ca12372279cf7948b4d4b3e8a11c50e428 (diff) | |
| parent | 71e146999c405ab301cd3c3e3aa03b89d46c461e (diff) | |
| download | gitlab-ce-2a9eed6620fd57c2a82edf5eab95dade3da250d3.tar.gz | |
Merge branch 'master' into rails-4.1.9
Conflicts:
app/views/projects/commits/_commit.html.haml
app/views/projects/issues/_issue.html.haml
app/views/projects/issues/_issue_context.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/show/_context.html.haml
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions