diff options
| author | Peter Kozak <spag@golwen.net> | 2013-06-22 10:22:48 +0200 |
|---|---|---|
| committer | Peter Kozak <spag@golwen.net> | 2013-06-22 10:22:48 +0200 |
| commit | 08ecc91d89a2b6a83daee4a1ffda5520e38e53c6 (patch) | |
| tree | 2f15799d3948eaa26abacef033c687b4362f602b /app/models/conference.rb | |
| parent | d21bf5513aa28187deb6b6c1ba21635b97ff82a4 (diff) | |
| parent | 4ce04ec03bc8f362d48ded43833645e7f454cb5c (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/models/conference.rb')
0 files changed, 0 insertions, 0 deletions