diff options
| author | spag <spag@golwen.net> | 2013-01-24 15:37:24 +0100 |
|---|---|---|
| committer | spag <spag@golwen.net> | 2013-01-24 15:37:24 +0100 |
| commit | 99270421d02b3ac77bf111bbde62a2ef80f8e114 (patch) | |
| tree | 6ddb8328729e53dcc7a605040cd7aece622d0e5a /test/factories/conferences.rb | |
| parent | 5f5ea1d06686ec5cd31cf8b9db177191fa7e66fd (diff) | |
| parent | 2d6ebf19e5cea45dd714f92a64b1b81e1200a811 (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'test/factories/conferences.rb')
0 files changed, 0 insertions, 0 deletions