Merge c1063645da into 17427c88fe
This commit is contained in:
commit
78d5bd670d
28 changed files with 333 additions and 22 deletions
|
|
@ -10,7 +10,8 @@ class Conference < ActiveRecord::Base
|
|||
:difficulty_levels_attributes, :use_difficulty_levels,
|
||||
:use_vpositions, :use_vdays, :vdays_attributes, :vpositions_attributes, :use_volunteers,
|
||||
:media_id, :media_type, :color, :description,
|
||||
:registration_description, :ticket_description
|
||||
:registration_description, :ticket_description,
|
||||
:lodging_description
|
||||
|
||||
has_paper_trail
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue