Merge branch 'master' into ticket-turnover-bug

This commit is contained in:
James Mason 2018-01-23 17:55:22 -08:00 • committed by GitHub
commit cf4271a5d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
58 changed files with 155 additions and 43 deletions

View file

@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20171130172334) do
ActiveRecord::Schema.define(version: 20171201163628) do
create_table "ahoy_events", force: :cascade do |t|
t.integer "visit_id"
@ -145,6 +145,7 @@ ActiveRecord::Schema.define(version: 20171130172334) do
t.datetime "created_at"
t.datetime "updated_at"
t.string "sponsor_email"
t.string "mastodon"
end
create_table "delayed_jobs", force: :cascade do |t|