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

@ -19,6 +19,7 @@
# require_registration :boolean
# start_time :datetime
# state :string default("new"), not null
# submission_text :text
# subtitle :string
# title :string not null
# week :integer