diff options
| author | spag <spag@golwen.net> | 2013-01-28 12:54:17 +0100 |
|---|---|---|
| committer | spag <spag@golwen.net> | 2013-01-28 12:54:17 +0100 |
| commit | 585c725c295b119d6299e8a3081dd4229e31e03d (patch) | |
| tree | 7902056b3e6ec6bb5661ef2c753ff7ee3d67e72e /app/models/conference.rb | |
| parent | bf1b92197212d3bd44ac8101814a7ffb08bb14bc (diff) | |
| parent | aa7b3fa2abf942bab5e7c6aaf34472b10641075b (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