diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 02:45:22 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 02:45:22 -0400 |
| commit | 7d40d2ed8bd686b32ff9bc620936a72044a610bc (patch) | |
| tree | 4e46ac6a1fca51e272837ef0d8f5921f3991e914 /config/locales | |
| parent | d3bee0f1ce0c5dc3fa741338bc6d9914e9e92787 (diff) | |
| parent | 07476fd9a2b942e8d6056804bb1cdbd5e9a1c528 (diff) | |
Merge branch 'clean2'
Conflicts:
app/controllers/tournaments_controller.rb
app/models/match.rb
app/views/matches/index.html.erb
app/views/matches/show.html.erb
app/views/tournaments/index.html.erb
app/views/tournaments/show.html.erb
Diffstat (limited to 'config/locales')
0 files changed, 0 insertions, 0 deletions