diff options
| author | Tomer Kimia <tkimia@purdue.edu> | 2014-03-07 17:55:38 -0500 |
|---|---|---|
| committer | Tomer Kimia <tkimia@purdue.edu> | 2014-03-07 17:55:38 -0500 |
| commit | bb84a760960c558857876e106bca94e31e15fe7d (patch) | |
| tree | d081a20550405cb3745c563362321e223d158697 /app/views/tournaments/show.html.erb | |
| parent | da284d090e74d790bd80a8e4ed0400eb073e36b6 (diff) | |
| parent | 5fe8ef2c4f33480766a477a27dcdfed6b6a26137 (diff) | |
better tournaments and tournament glitch fix
Merge branch 'master' of https://github.com/LukeShu/leaguer
Conflicts:
app/controllers/tournaments_controller.rb
Diffstat (limited to 'app/views/tournaments/show.html.erb')
0 files changed, 0 insertions, 0 deletions