Merge master, resolve schema conflicts

This commit is contained in:
Michael Ball 2021-03-02 22:35:01 -08:00
commit 04154020a5
42 changed files with 757 additions and 131 deletions

View file

@ -258,6 +258,7 @@ ActiveRecord::Schema.define(version: 2021_03_03_052026) do
t.integer "max_attendees"
t.integer "comments_count", default: 0, null: false
t.text "committee_review"
t.text "submission_text"
end
create_table "events_registrations", force: :cascade do |t|