diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-07 04:18:09 -0400 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-07 04:18:09 -0400 |
| commit | b5f430fd59f7140722cc7940356c1de1ddd6f4d4 (patch) | |
| tree | 44f8d8f62cd3535a897a28b5a99e8dfb917dc995 /purple.yaml | |
| parent | 26738698ae3a26c98d81a03309c150c7e38e3488 (diff) | |
| parent | c3af0f5b51dfe842ad9e4c5ea93e202e26e818ac (diff) | |
Merge branch 'clean2'
Conflicts:
app/views/matches/index.html.erb
app/views/matches/show.html.erb
Diffstat (limited to 'purple.yaml')
0 files changed, 0 insertions, 0 deletions