gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into org-adimins-frontend

Browse source
This commit is contained in:
Shlok Srivastava 2017-08-22 12:20:51 +00:00 • committed by GitHub
commit 334efb3cba
28 changed files with 179 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin/conferences_controller.rb
View file

@ -211,7 +211,7 @@ module Admin
:vpositions_attributes, :use_volunteers, :color,
:sponsorship_levels_attributes, :sponsors_attributes,
:targets, :targets_attributes,
:campaigns, :campaigns_attributes, :registration_limit, :organization_id, :ticket_layout)
:campaigns, :campaigns_attributes, :registration_limit, :organization_id, :ticket_layout, :booth_limit)
end
end
end