diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-15 16:08:20 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-15 16:08:20 +0100 |
| commit | 55784bcffc0678ce6102c0b81447434a8030ebd2 (patch) | |
| tree | 49ed889b1d10cda98c475f3453abff1b97afb4e7 /app/models/conference.rb | |
| parent | e5e1f49fb03989a4b69ed88bf7eb7a909c659a18 (diff) | |
| parent | 8474fe8ce8fe660ae65a59ed4fcad31c2e5647a2 (diff) | |
Merge branch 'sim_card' into develop
Diffstat (limited to 'app/models/conference.rb')
0 files changed, 0 insertions, 0 deletions