diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2014-12-07 20:25:58 -0700 |
|---|---|---|
| committer | Vinnie Okada <vokada@mrvinn.com> | 2014-12-07 20:25:58 -0700 |
| commit | 742e6eeed221489d5f35bdfde2e6ce55db75d25f (patch) | |
| tree | 710c01fbd18e81a7590819161434e19855e35a97 /app/models/commit.rb | |
| parent | 7a5072c5a8f03cd7342a5f8e74e1fde0250ce360 (diff) | |
| parent | bbf9953b99d59801c72dd7b9550ee149ca77bfcf (diff) | |
| download | gitlab-ce-742e6eeed221489d5f35bdfde2e6ce55db75d25f.tar.gz | |
Merge branch 'upstream-master' into markdown-preview
Conflicts:
spec/routing/project_routing_spec.rb
Diffstat (limited to 'app/models/commit.rb')
0 files changed, 0 insertions, 0 deletions