Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
app/assets/stylesheets/static.css.scss
app/controllers/static_controller.rb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
thought of that earlier
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
app/controllers/tournaments_controller.rb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
config/initializers/mailboxer.rb
config/routes.rb
|