Merge branch 'master' into 176895554/mailbluster

2021-04-12 15:27:20 -07:00 · 2021-04-12 15:27:20 -07:00 · d6fe38bb2c
commit d6fe38bb2c
parent d6da99cc1f 41a0193ad3
22 changed files with 291 additions and 34 deletions
--- a/app/models/splashpage.rb
+++ b/app/models/splashpage.rb
@ -11,6 +11,7 @@
 #  banner_photo_updated_at   :datetime
 #  include_booths            :boolean
 #  include_cfp               :boolean          default(FALSE)
+#  include_happening_now     :boolean
 #  include_lodgings          :boolean
 #  include_program           :boolean
 #  include_registrations     :boolean