diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-26 20:27:09 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-26 20:27:09 -0400 |
| commit | 0776c57b939208736db60d38b4530e8b1c306ec6 (patch) | |
| tree | 6a831d94039c9c86175b73af0aab525e6bd78983 /app/views/common/_show_tournament.html.erb | |
| parent | 853c307700fa81b924e00bf430c878a3b7029ffe (diff) | |
| parent | 62219ac4e3af36cc15c9ad61701550bee9a8424c (diff) | |
Merge branch 'clean2'
Conflicts:
app/controllers/tournaments_controller.rb
app/views/tournaments/index.html.erb
app/views/tournaments/show.html.erb
Diffstat (limited to 'app/views/common/_show_tournament.html.erb')
0 files changed, 0 insertions, 0 deletions