diff options
| author | guntasgrewal <guntasgrewal@gmail.com> | 2014-04-07 03:58:45 -0400 |
|---|---|---|
| committer | guntasgrewal <guntasgrewal@gmail.com> | 2014-04-07 03:58:45 -0400 |
| commit | 26738698ae3a26c98d81a03309c150c7e38e3488 (patch) | |
| tree | d118af5019890b00518d9da9099205bdb51ccfff /db | |
| parent | f20dc8df17187027c1881803dbc72b1d3802ff1a (diff) | |
| parent | 641e968a7ffaaa31724b34422cc165d4b66ae131 (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Conflicts:
app/controllers/matches_controller.rb
app/views/matches/show.html.erb
Diffstat (limited to 'db')
| -rw-r--r-- | db/schema.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/db/schema.rb b/db/schema.rb index f4612b8..df3d690 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -72,6 +72,7 @@ ActiveRecord::Schema.define(version: 20140407000143) do create_table "matches", force: true do |t| t.integer "status" t.integer "tournament_id" + t.integer "submitted_peer_evaluations" t.string "name" t.integer "winner_id" t.string "remote_id" |