Age | Commit message (Collapse) | Author |
|
|
|
Conflicts:
app/models/team.rb
app/views/matches/index.html.erb
app/views/matches/show.html.erb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
app/models/match.rb
|
|
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
|
|
|
|
|
|
without consulting me.
|
|
|
|
|
|
|
|
|
|
for a more general approach.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
start.sh
|
|
|
|
|
|
|
|
|
|
Conflicts:
Gemfile
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|