diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-05 23:10:07 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-05 23:10:07 +0100 |
| commit | 3862734b5e0833ed108300102c68159e40ffd93a (patch) | |
| tree | 4491044dbf48aea515303382e7664cf9be2cb182 /app/controllers/conferences_controller.rb | |
| parent | 380a4cdfe5cfa573fb916ca7c2145a6062ef8198 (diff) | |
| parent | 57196d838691aeba38ad7e088e83c0881a213861 (diff) | |
Merge branch 'replace_constants' into develop
Diffstat (limited to 'app/controllers/conferences_controller.rb')
| -rw-r--r-- | app/controllers/conferences_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/conferences_controller.rb b/app/controllers/conferences_controller.rb index 302a23b..6091b46 100644 --- a/app/controllers/conferences_controller.rb +++ b/app/controllers/conferences_controller.rb @@ -19,7 +19,7 @@ class ConferencesController < ApplicationController @conference.start = nil @conference.end = nil @conference.open_for_anybody = true - @conference.max_members = DEFAULT_MAX_CONFERENCE_MEMBERS + @conference.max_members = GsParameter.get('DEFAULT_MAX_CONFERENCE_MEMBERS') @conference.pin = random_pin @conference.open_for_anybody = true |