diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-21 14:10:02 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-21 14:10:02 +0100 |
| commit | 29a22b3f498f2962c45f0c834d04d550b22b9348 (patch) | |
| tree | bf4eec95c2423027ef57e8e231d20608255733d3 /app/models/conference.rb | |
| parent | f7c8227521a758f769d3bde892b8b7201bf841dc (diff) | |
| parent | 86e94e36e52ff7a3dbc7219db5b3bea5a7f56711 (diff) | |
Merge branch 'area_code' into develop
Diffstat (limited to 'app/models/conference.rb')
0 files changed, 0 insertions, 0 deletions