diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-06 13:19:20 -0400 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-06 13:19:20 -0400 |
commit | 82840d22116835474614b80ebe72c282bcfc5f5e (patch) | |
tree | ea24c3648274c664ba014f28356ae353d049b643 /db/schema.rb | |
parent | 0d42079611ed2aeacd71b926580fdc3b943cf1ba (diff) | |
parent | d2e4f58410c20f5e7b9e8e0dde3fd55d201af4bb (diff) |
Merge branch 'clean2'
Conflicts:
app/views/servers/show.html.erb
Diffstat (limited to 'db/schema.rb')
-rw-r--r-- | db/schema.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/db/schema.rb b/db/schema.rb index 829ad0e..53bc413 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140406015417) do +ActiveRecord::Schema.define(version: 20140406171543) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -115,6 +115,7 @@ ActiveRecord::Schema.define(version: 20140406015417) do end create_table "servers", force: true do |t| + t.integer "default_user_permissions" t.datetime "created_at" t.datetime "updated_at" end |