diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 22:17:36 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 22:17:36 -0500 |
commit | 5f2247dd1e701a91fb0359bf7265bdadd5486a60 (patch) | |
tree | 8966f53e304731faf26b19230439f831b215d3f1 /app/models/match.rb | |
parent | 4a91128f6fe20d95b6692abaa5e6c4dc92418b46 (diff) | |
parent | 2bfc17c39f9b8b5ea71d36d2d5f041295f24192f (diff) |
Merge branch 'master' of github.com:LukeShu/leaguer
Conflicts:
config/routes.rb
Diffstat (limited to 'app/models/match.rb')
-rw-r--r-- | app/models/match.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/match.rb b/app/models/match.rb index 533435a..8acebf7 100644 --- a/app/models/match.rb +++ b/app/models/match.rb @@ -1,3 +1,4 @@ class Match < ActiveRecord::Base belongs_to :tournament + end |