diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-27 12:22:29 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-27 12:22:29 +0100 |
| commit | 67c1a0a951403a546250ea860a3e3d199cae2fce (patch) | |
| tree | f86ec6cedf081a1a57005eca1661e9bead34e4de /app/models/conference.rb | |
| parent | 5d8ce5f4775ac8bc5f523964e6e36f63ff3c4683 (diff) | |
| parent | 211f558a86ae30cdd5b392ab1376e1393f97e22c (diff) | |
Merge branch 'develop'5.1-beta6
Diffstat (limited to 'app/models/conference.rb')
0 files changed, 0 insertions, 0 deletions