Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
app/controllers/application_controller.rb
app/controllers/tournaments_controller.rb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
config/routes.rb
|
|
|
|
Conflicts:
app/controllers/tournaments_controller.rb
|
|
|
|
|
|
|
|
Conflicts:
app/controllers/tournaments_controller.rb
app/models/tournament.rb
app/views/tournaments/_selected.html.erb
app/views/tournaments/new.html.erb
config/routes.rb
|
|
Conflicts:
app/controllers/tournaments_controller.rb
app/views/teams/show.html.erb
app/views/tournaments/index.html.erb
config/routes.rb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|