diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-10 10:35:59 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-10 10:35:59 +0100 |
| commit | c0c87dc9a80d7bf7f6dd7a779a6519a0e1425c5c (patch) | |
| tree | e70818437f487574f481ab8188377e85e18a2f96 /app/controllers/conferences_controller.rb | |
| parent | 70c436c52c76cf866b03fcab6bc43437c9490cd1 (diff) | |
| parent | 120b8b444b10b0d42c9ddc773a48f3210f316e59 (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/controllers/conferences_controller.rb')
0 files changed, 0 insertions, 0 deletions