diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-15 14:49:43 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-15 14:49:43 +0100 |
| commit | 72a56d20496e58a1d1debc3a859d40aa73e246b5 (patch) | |
| tree | c16baf628633205b2e664f86f2e0038f3ee3b097 /app/models/conference.rb | |
| parent | 124a421b19e08447fa790b65cc969dadd7408539 (diff) | |
| parent | 3d11d0a3a047a12bfd40b61252e269cabac76225 (diff) | |
Merge branch 'sim_card' into develop
Diffstat (limited to 'app/models/conference.rb')
0 files changed, 0 insertions, 0 deletions