diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-06 20:52:41 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-06 20:52:41 +0100 |
| commit | fb4f1dc612ee8fc3ad73ae5aafba6e918e29eea9 (patch) | |
| tree | 350c0fe981cfe1cf7d9b4de51ad73b7e3a26449b /app/models/conference.rb | |
| parent | c500e125c2ee5297b51e463f93940d450dab0813 (diff) | |
| parent | 464a2f4907bd27b62f7b5cc5d7537b90469b03bd (diff) | |
Merge branch 'improve_gs_parameter' into develop
Diffstat (limited to 'app/models/conference.rb')
0 files changed, 0 insertions, 0 deletions