Age | Commit message (Collapse) | Author |
|
Conflicts:
app/controllers/tournaments_controller.rb
app/views/tournaments/_form.html.erb
app/views/tournaments/index.html.erb
app/views/tournaments/show.html.erb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
new one has 2 flag options -c and -s these correspond to starting the console or server respectively.
|
|
|
|
Conflicts:
app/controllers/tournaments_controller.rb
app/views/tournaments/index.html.erb
app/views/tournaments/show.html.erb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
app/views/matches/show.html.erb
|
|
|
|
|
|
|
|
|
|
Conflicts:
app/models/pm.rb
app/views/pms/index.html.erb
app/views/pms/show.html.erb
|
|
|
|
|