diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-03-07 00:31:47 -0500 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-07 00:31:47 -0500 |
| commit | 1ecd3d50d0ac73968362f885c9f60ec38253be9a (patch) | |
| tree | 324f79ad4d4da1af623fc93f215643287d6210f3 /app/views/users/show.html.erb | |
| parent | b2e0b1397596ee8f624ef4de122cc71599d4dc0d (diff) | |
| parent | c1f714a479eb7ca9e9125e283361a471dd928278 (diff) | |
Merge branch 'clean'
Conflicts:
app/models/match.rb
app/views/matches/index.html.erb
app/views/matches/show.html.erb
Diffstat (limited to 'app/views/users/show.html.erb')
0 files changed, 0 insertions, 0 deletions