diff options
| author | spag <spag@golwen.net> | 2013-01-29 20:59:22 +0100 |
|---|---|---|
| committer | spag <spag@golwen.net> | 2013-01-29 20:59:22 +0100 |
| commit | 880cf1cd12ff8851337bc67f9c29ac53229ac911 (patch) | |
| tree | 5b685363a9928ceb457fa956cb2880d485276510 /app/models/conference.rb | |
| parent | 9928e509175ec6dbb9cd77aaeb06168c0de99d38 (diff) | |
| parent | 5d84248cf177635a19f033f53abbca87ac5c87bc (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