Age | Commit message (Collapse) | Author |
|
|
|
Conflicts:
config/initializers/mailboxer.rb
config/routes.rb
|
|
|
|
|
|
|
|
|
|
|
|
I left it in most places (to be fixed later), but in the user model it
broke seeds.rb, so I am reverting that.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
copyleft notice for chess.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
app/models/team.rb
app/views/matches/index.html.erb
app/views/matches/show.html.erb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
app/models/match.rb
|